refact: enable opt-in features for bottom close icon padding & closea…

FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/bubble/FloatingCloseBubble.kt

@@ -58,7 +58,7 @@ class FloatingCloseBubble(
             halfWidthPx = width / 2
             halfHeightPx = height / 2
             baseX = halfSafeScreenWidth - halfWidthPx
-            baseY = sez.safeHeight - height - bottomPaddingPx
+            baseY = sez.safeHeight - (halfHeightPx + bottomPaddingPx)
 
             centerCloseBubbleX = halfSafeScreenWidth
             centerCloseBubbleY = baseY + halfHeightPx

FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/service/FloatingBubbleService.kt

@@ -5,8 +5,6 @@ import android.content.Intent
 import android.os.IBinder
 import com.torrydo.floatingbubbleview.canDrawOverlays
 import com.torrydo.floatingbubbleview.helper.NotificationHelper
-import com.torrydo.floatingbubbleview.service.expandable.BubbleBuilder
-import com.torrydo.floatingbubbleview.service.expandable.ExpandedBubbleBuilder
 import com.torrydo.floatingbubbleview.sez
 
 

FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/service/expandable/BubbleBuilder.kt

@@ -102,6 +102,16 @@ class BubbleBuilder(
         return this
     }
 
+    /**
+     * The padding beneath the close icon.
+     *
+     * @param dp Distance beneath the close icon
+     */
+    fun closeBubbleBottomPadding(dp: Int): BubbleBuilder {
+        this.closeBubbleBottomPaddingPx = dp
+        return this
+    }
+
     /**
      * @param enabled show gradient dark background on the bottom of the screen
      * */

FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/service/expandable/ExpandableBubbleService.kt

@@ -28,6 +28,9 @@ abstract class ExpandableBubbleService : FloatingBubbleService() {
     var expandedBubble: FloatingBubble? = null
         private set
 
+    private var enableServiceTermination: Boolean = true
+        private set
+
     private var closeBubble: FloatingCloseBubble? = null
     private var bottomBackground: FloatingBottomBackground? = null
 
@@ -159,6 +162,16 @@ abstract class ExpandableBubbleService : FloatingBubbleService() {
         expandedBubble?.isDraggable = b
     }
 
+    /**
+     * Specify whether the background service should be terminated or not.
+     * If enabled, the floating popup, close icon, expanded view, foreground notification will all be terminated.
+     *
+     * @param b Boolean parameter, where true enables automatic service termination.
+     */
+    fun enableServiceTermination(b: Boolean) {
+        enableServiceTermination = b
+    }
+
     fun animateBubbleToEdge() {
         bubble?.animateIconToEdge()
     }
@@ -255,7 +268,8 @@ abstract class ExpandableBubbleService : FloatingBubbleService() {
             }
 
             if (shouldDestroy) {
-                serviceInteractor?.requestStop()
+                removeAll()
+                if (enableServiceTermination) serviceInteractor?.requestStop()
             } else {
                 if (mAnimateToEdge) {
                     mBubble.animateIconToEdge()

app/src/main/java/com/torrydo/testfloatingbubble/MainActivityKt.kt

@@ -1,7 +1,9 @@
 package com.torrydo.testfloatingbubble
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.provider.Settings
 import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -25,11 +27,21 @@ class MainActivityKt : AppCompatActivity() {
             if (isBubbleRunning) {
                 stopMyService()
             } else {
-                val intent = Intent(this, MyServiceKt::class.java)
-                intent.putExtra("size", 60)
-                intent.putExtra("noti_message", "HELLO FROM MAIN ACT")
-                ContextCompat.startForegroundService(this, intent)
-                isVisible = false
+                // Check if the application has draw over other apps permission, and request it if not
+                if (!Settings.canDrawOverlays(this)) {
+                    startActivity(
+                        Intent(
+                            Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                            Uri.parse("package:$packageName")
+                        )
+                    )
+                } else {
+                    val intent = Intent(this, MyServiceKt::class.java)
+                    intent.putExtra("size", 60)
+                    intent.putExtra("noti_message", "HELLO FROM MAIN ACT")
+                    ContextCompat.startForegroundService(this, intent)
+                    isVisible = false
+                }
             }
 
             isBubbleRunning = !isBubbleRunning

app/src/main/java/com/torrydo/testfloatingbubble/MyServiceKt.kt

@@ -23,6 +23,7 @@ class MyServiceKt : ExpandableBubbleService() {
 
     override fun onCreate() {
         super.onCreate()
+        super.enableServiceTermination(true)
         minimize()
     }
 
@@ -67,6 +68,9 @@ class MyServiceKt : ExpandableBubbleService() {
             // the more value (dp), the larger closeable-area
             .distanceToClose(100)
 
+            // The more value (dp), the higher the close view
+            .closeBubbleBottomPadding(10)
+
             // enable bottom background, false by default
             .bottomBackground(false)