Action buttons improved

Author: philips77

ui/src/main/java/no/nordicsemi/android/common/ui/view/ActionIconButton.kt

@@ -2,18 +2,12 @@
 
 package no.nordicsemi.android.common.ui.view
 
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.ProgressIndicatorDefaults
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -44,13 +38,14 @@ fun ActionIconButton(
 ) {
     IconButton(
         modifier = modifier,
-        enabled = enabled,
+        enabled = enabled && !isInProgress,
         onClick = onClick,
     ) {
         when {
             isInProgress -> {
                 CircularProgressIndicator(
                     modifier = Modifier.size(size = 24.dp),
+                    strokeWidth = 2.dp,
                     color = iconTint ?: ProgressIndicatorDefaults.circularColor
                 )
             }

ui/src/main/java/no/nordicsemi/android/common/ui/view/ActionOutlineButton.kt

@@ -51,13 +51,15 @@ fun ActionOutlinedButton(
     OutlinedButton(
         modifier = modifier.defaultMinSize(minWidth = 120.dp),
         border = border,
-        enabled = enabled,
+        enabled = enabled && !isInProgress,
+        contentPadding = ButtonDefaults.ButtonWithIconContentPadding,
         onClick = onClick,
     ) {
         when {
             isInProgress -> {
                 CircularProgressIndicator(
                     modifier = Modifier.size(size = 24.dp),
+                    strokeWidth = 2.dp,
                     color = iconTint ?: ProgressIndicatorDefaults.circularColor,
                 )
             }