RTL support

Highlight mode enum created
Update kotlin stdlib

Author: JorgeCM

app/build.gradle

@@ -25,7 +25,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':bubbleshowcase')
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/elconfidencial/bubbleshowcase/MainActivity.kt

@@ -52,6 +52,7 @@ class MainActivity : AppCompatActivity() {
                 .image(ContextCompat.getDrawable(this, R.drawable.ic_format_size)!!)
                 .titleTextSize(18)
                 .descriptionTextSize(16)
+                .closeActionImage(null)
                 .targetView(buttonTextSizeShowCase)
     }
 

app/src/main/res/layout/activity_main.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+
     tools:context="com.elconfidencial.bubbleshowcase.MainActivity">
 
     <Button

bubbleshowcase/build.gradle

@@ -39,7 +39,7 @@ dokka {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.android.support:appcompat-v7:26.1.0'
     testImplementation 'junit:junit:4.12'

bubbleshowcase/src/main/java/com/elconfidencial/bubbleshowcase/BubbleMessageView.kt

@@ -79,6 +79,11 @@ class BubbleMessageView : ConstraintLayout {
             imageViewClose?.visibility = View.VISIBLE
             imageViewClose?.setImageDrawable(builder.mCloseAction!!)
         }
+
+        if(builder.mDisableCloseAction!=null && builder.mDisableCloseAction!!){
+            imageViewClose?.visibility = View.INVISIBLE
+        }
+
         builder.mTitle?.let {
             textViewTitle?.visibility = View.VISIBLE
             textViewTitle?.text = builder.mTitle
@@ -235,6 +240,7 @@ class BubbleMessageView : ConstraintLayout {
         lateinit var mContext: WeakReference<Context>
         var mTargetViewScreenLocation: RectF? = null
         var mImage: Drawable? = null
+        var mDisableCloseAction: Boolean? = null
         var mTitle: String? = null
         var mSubtitle: String? = null
         var mCloseAction: Drawable? = null
@@ -270,6 +276,11 @@ class BubbleMessageView : ConstraintLayout {
             return this
         }
 
+        fun disableCloseAction(isDisabled: Boolean): Builder {
+            mDisableCloseAction = isDisabled
+            return this
+        }
+
         fun targetViewScreenLocation(targetViewLocationOnScreen: RectF): Builder{
             mTargetViewScreenLocation = targetViewLocationOnScreen
             return this

bubbleshowcase/src/main/java/com/elconfidencial/bubbleshowcase/BubbleShowCase.kt

@@ -40,6 +40,16 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
         TOP, BOTTOM, LEFT, RIGHT
     }
 
+    /**
+     * Highlight mode. It represents the way that the target view will be highlighted
+     * - VIEW_LAYOUT: Default value. All the view box is highlighted (the rectangle where the view is contained). Example: For a TextView, all the element is highlighted (characters and background)
+     * - VIEW_SURFACE: Only the view surface is highlighted, but not the background. Example: For a TextView, only the characters will be highlighted
+     */
+    enum class HighlightMode {
+        VIEW_LAYOUT, VIEW_SURFACE
+    }
+
+
     private val mActivity: WeakReference<Activity> = builder.mActivity!!
 
     //BubbleMessageView params
@@ -53,6 +63,8 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
     private val mSubtitleTextSize: Int? = builder.mSubtitleTextSize
     private val mShowOnce: String? = builder.mShowOnce
     private val mDisableTargetClick: Boolean = builder.mDisableTargetClick
+    private val mDisableCloseAction: Boolean = builder.mDisableCloseAction
+    private val mHighlightMode: BubbleShowCase.HighlightMode? = builder.mHighlightMode
     private val mArrowPositionList: MutableList<ArrowPosition> = builder.mArrowPositionList
     private val mTargetView: WeakReference<View>? = builder.mTargetView
     private val mBubbleShowCaseListener: BubbleShowCaseListener?  = builder.mBubbleShowCaseListener
@@ -153,6 +165,7 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
                 .subtitle(mSubtitle)
                 .image(mImage)
                 .closeActionImage(mCloseAction)
+                .disableCloseAction(mDisableCloseAction)
                 .listener(object : OnDismissBubbleMessageViewListener{
                     override fun onDismiss() {
                         dismiss()
@@ -188,7 +201,7 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
     private fun addTargetViewAtForegroundLayout(targetView: View?, foregroundLayout: RelativeLayout?) {
         if(targetView==null) return
 
-        val targetScreenshot = takeScreenshot(targetView)
+        val targetScreenshot = takeScreenshot(targetView, mHighlightMode)
         val targetScreenshotView = ImageView(mActivity.get()!!)
         targetScreenshotView.setImageBitmap(targetScreenshot)
         targetScreenshotView.setOnClickListener {
@@ -198,7 +211,7 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
         }
 
         val targetViewParams = RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT)
-        targetViewParams.setMargins(getXposition(targetView), getYposition(targetView), 0, 0)
+        targetViewParams.setMargins(getXposition(targetView), getYposition(targetView), getScreenWidth(mActivity.get()!!) - (getXposition(targetView) + targetView.width), 0)
         foregroundLayout?.addView(AnimationUtils.setBouncingAnimation(targetScreenshotView, 0, DURATION_BEATING_ANIMATION), targetViewParams)
     }
 
@@ -317,7 +330,13 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
         }
     }
 
-    private fun takeScreenshot(targetView: View): Bitmap? {
+    private fun takeScreenshot(targetView: View, highlightMode: HighlightMode?): Bitmap? {
+        if (highlightMode==null || highlightMode == HighlightMode.VIEW_LAYOUT)
+            return takeScreenshotOfLayoutView(targetView)
+        return takeScreenshotOfSurfaceView(targetView)
+    }
+
+    private fun takeScreenshotOfLayoutView(targetView: View): Bitmap? {
         if (targetView.width == 0 || targetView.height == 0) {
             return null
         }
@@ -332,6 +351,17 @@ class BubbleShowCase(builder: BubbleShowCaseBuilder){
         return bitmap
     }
 
+    private fun takeScreenshotOfSurfaceView(targetView: View): Bitmap? {
+        if (targetView.width == 0 || targetView.height == 0) {
+            return null
+        }
+
+        targetView.isDrawingCacheEnabled = true
+        val bitmap: Bitmap = Bitmap.createBitmap(targetView.drawingCache)
+        targetView.isDrawingCacheEnabled = false
+        return bitmap
+    }
+
     private fun getXposition(targetView: View): Int{
         return ScreenUtils.getAxisXpositionOfViewOnScreen(targetView) - getScreenHorizontalOffset()
     }

bubbleshowcase/src/main/java/com/elconfidencial/bubbleshowcase/BubbleShowCaseBuilder.kt

@@ -21,7 +21,9 @@ class BubbleShowCaseBuilder{
     internal var mTextColor: Int? = null
     internal var mTitleTextSize: Int? = null
     internal var mSubtitleTextSize: Int? = null
+    internal var mHighlightMode: BubbleShowCase.HighlightMode? = null
     internal var mDisableTargetClick: Boolean = false
+    internal var mDisableCloseAction: Boolean = false
     internal var mShowOnce: String? = null
     internal var mIsFirstOfSequence: Boolean? = null
     internal var mIsLastOfSequence: Boolean? = null
@@ -136,6 +138,15 @@ class BubbleShowCaseBuilder{
         return this
     }
 
+    /**
+     * If this variable is true, close action button will be gone
+     *  Default value -> false
+     */
+    fun disableCloseAction(isDisabled: Boolean): BubbleShowCaseBuilder{
+        mDisableCloseAction = isDisabled
+        return this
+    }
+
     /**
      * Insert an arrowPosition to force the position of the BubbleShowCase.
      * - ArrowPosition enum values: LEFT, RIGHT, TOP and DOWN
@@ -158,6 +169,16 @@ class BubbleShowCaseBuilder{
         return this
     }
 
+    /**
+     * Highlight mode. It represents the way that the target view will be highlighted
+     * - VIEW_LAYOUT: Default value. All the view box is highlighted (the rectangle where the view is contained). Example: For a TextView, all the element is highlighted (characters and background)
+     * - VIEW_SURFACE: Only the view surface is highlighted, but not the background. Example: For a TextView, only the characters will be highlighted
+     */
+    fun highlightMode(highlightMode: BubbleShowCase.HighlightMode): BubbleShowCaseBuilder {
+        mHighlightMode = highlightMode
+        return this
+    }
+
     /**
      * Add a BubbleShowCaseListener in order to listen the user actions:
      * - onTargetClick -> It is triggered when the user clicks on the target view