Minor fixes

Author: kirich1409

core/src/main/java/com/kirich1409/androidnotificationdsl/action/Actions.kt

@@ -18,68 +18,70 @@ class Actions @PublishedApi internal constructor(private val builder: Notificati
     /**
      * Add an action to this notification. Actions are typically displayed by
      * the system as a button adjacent to the notification content.
+     *
+     * On pre-Lollpop devices invisible actions will be ignored
      */
     fun action(
         title: CharSequence?,
         intent: PendingIntent?,
         icon: IconCompat? = null,
-        visible: Boolean = false
+        visible: Boolean = true
     ) {
-        if (visible || isInvisibleActionsSupported()) {
-            val action = NotificationCompat.Action.Builder(icon, title, intent).build()
-            addAction(action, visible)
+        addAction(visible) {
+            NotificationCompat.Action.Builder(icon, title, intent)
         }
     }
 
     /**
      * Add an action to this notification. Actions are typically displayed by
      * the system as a button adjacent to the notification content.
+     *
+     * On pre-Lollpop devices invisible actions will be ignored
      */
     fun action(
         title: CharSequence?,
         intent: PendingIntent?,
         @DrawableRes icon: Int,
-        visible: Boolean = false
+        visible: Boolean = true
     ) {
-        if (visible || isInvisibleActionsSupported()) {
-            val action = NotificationCompat.Action.Builder(icon, title, intent).build()
-            addAction(action, visible)
+        addAction(visible) {
+            NotificationCompat.Action.Builder(icon, title, intent)
         }
     }
 
     /**
      * Add an action to this notification. Actions are typically displayed by
      * the system as a button adjacent to the notification content.
+     *
+     * On pre-Lollpop devices invisible actions will be ignored
      */
     inline fun action(
         title: CharSequence?,
         intent: PendingIntent?,
         icon: IconCompat? = null,
-        visible: Boolean = false,
-        body: @NotificationActionsMarker Action.() -> Unit
+        visible: Boolean = true,
+        crossinline body: @NotificationActionsMarker Action.() -> Unit
     ) {
-        if (visible || isInvisibleActionsSupported()) {
-            val actionBuilder = NotificationCompat.Action.Builder(icon, title, intent)
-            Action(actionBuilder).body()
-            addAction(actionBuilder.build(), visible)
+        addAction(visible) {
+            NotificationCompat.Action.Builder(icon, title, intent).apply { Action(this).body() }
         }
     }
 
     /**
      * Add an action to this notification. Actions are typically displayed by
      * the system as a button adjacent to the notification content.
+     *
+     * On pre-Lollpop devices invisible actions will be ignored
      */
     inline fun action(
         title: CharSequence?,
         intent: PendingIntent?,
         @DrawableRes icon: Int,
-        visible: Boolean = false,
-        body: @NotificationActionsMarker Action.() -> Unit
+        visible: Boolean = true,
+        crossinline body: @NotificationActionsMarker Action.() -> Unit
     ) {
-        if (visible || isInvisibleActionsSupported()) {
-            val actionBuilder = NotificationCompat.Action.Builder(icon, title, intent)
-            Action(actionBuilder).body()
-            addAction(actionBuilder.build(), visible)
+        addAction(visible) {
+            NotificationCompat.Action.Builder(icon, title, intent).apply { Action(this).body() }
         }
     }
 
@@ -89,14 +91,23 @@ class Actions @PublishedApi internal constructor(private val builder: Notificati
      *
      * On pre-Lollpop devices invisible actions will be ignored
      *
-     * @param visible is actions are never displayed by the system,
-     * but can be retrieved and used by other application listening to system notifications
+     * @param visible is actions are never displayed by the system, but can be retrieved
+     *                and used by other application listening to system notifications
      */
-    fun addAction(action: NotificationCompat.Action, visible: Boolean = false) {
+    fun addAction(action: NotificationCompat.Action, visible: Boolean = true) {
         if (visible) {
             builder.addAction(action)
         } else if (isInvisibleActionsSupported()) {
             builder.addInvisibleAction(action)
         }
     }
+
+    @PublishedApi
+    internal fun addAction(visible: Boolean = true, action: () -> NotificationCompat.Action.Builder) {
+        if (visible) {
+            builder.addAction(action().build())
+        } else if (isInvisibleActionsSupported()) {
+            builder.addInvisibleAction(action().build())
+        }
+    }
 }

core/src/main/java/com/kirich1409/androidnotificationdsl/internal/Collections.kt

@@ -10,6 +10,7 @@ import androidx.collection.SparseArrayCompat
  */
 @PublishedApi
 @Suppress("RemoveExplicitTypeArguments", "UNCHECKED_CAST")
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 internal inline fun <reified T> Iterable<T>.toArray(): Array<T> {
     return when (this) {
         is List<T> -> toTypedArray<T>()
@@ -19,6 +20,7 @@ internal inline fun <reified T> Iterable<T>.toArray(): Array<T> {
 }
 
 @PublishedApi
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 internal inline fun <E> SparseArrayCompat<E>.forEach(body: (Int, E) -> Unit) {
     for (index in 0 until size()) {
         body(keyAt(index), valueAt(index))

core/src/main/java/com/kirich1409/androidnotificationdsl/internal/Constants.kt

@@ -1,8 +1,11 @@
 package com.kirich1409.androidnotificationdsl.internal
 
+import androidx.annotation.RestrictTo
+
 /**
  * Maximum length of CharSequences accepted by Builder and friends.
  *
  * Avoids spamming the system with overly large strings such as full e-mails.
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 internal const val MAX_CHARSEQUENCE_LENGTH: Long = 5 * 1024

core/src/main/java/com/kirich1409/androidnotificationdsl/internal/NotificationUtils.kt

@@ -3,11 +3,13 @@
 package com.kirich1409.androidnotificationdsl.internal
 
 import android.os.Build
+import androidx.annotation.RestrictTo
 
 /**
  * Check is invisible actions are supported on current device
  */
 @PublishedApi
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 internal fun isInvisibleActionsSupported(): Boolean {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
 }