SES-4619 - Special case of disabled color for buttons on bg secondary

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/community/JoinCommunityScreen.kt

@@ -183,6 +183,7 @@ private fun CommunityScreen(
                     .fillMaxWidth()
                     .qaTag(R.string.AccessibilityId_communityJoin),
                 enabled = state.isJoinButtonEnabled,
+                disabledColor = LocalColors.current.textSecondary,
                 onClick = {
                     sendCommand(JoinCommunityViewModel.Commands.JoinCommunity(
                         state.communityUrl

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/newmessage/NewMessage.kt

@@ -139,6 +139,7 @@ private fun EnterAccountId(
                     .fillMaxWidth()
                     .qaTag(R.string.next),
                 enabled = state.isNextButtonEnabled,
+                disabledColor = LocalColors.current.textSecondary,
                 onClick = callbacks::onContinue
             ) {
                 LoadingArcOr(state.loading) {

app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt

@@ -162,8 +162,13 @@ fun Button(
     Button(text, onClick, ButtonType.Outline(LocalColors.current.accentText), modifier, enabled, minWidth = minWidth)
 }
 
-@Composable fun AccentOutlineButton(modifier: Modifier = Modifier, enabled: Boolean = true, onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {
-    Button(onClick, ButtonType.Outline(LocalColors.current.accentText), modifier, enabled, content = content)
+@Composable fun AccentOutlineButton(modifier: Modifier = Modifier, enabled: Boolean = true,
+                                    disabledColor: Color = LocalColors.current.disabled,
+                                    onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {
+    Button(onClick, ButtonType.Outline(
+        contentColor = LocalColors.current.accentText,
+        disabledColor = disabledColor
+    ), modifier, enabled, content = content)
 }
 
 @Composable fun SlimOutlineButton(modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {

app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt

@@ -26,18 +26,19 @@ interface ButtonType {
 
     class Outline(
         private val contentColor: Color,
-        private val borderColor: Color = contentColor
+        private val borderColor: Color = contentColor,
+        private val disabledColor: Color? = null
     ): ButtonType {
         @Composable
         override fun border(enabled: Boolean) = BorderStroke(
             width = LocalDimensions.current.borderStroke,
-            color = if (enabled) borderColor else LocalColors.current.disabled
+            color = if (enabled) borderColor else disabledColor ?: LocalColors.current.disabled
         )
         @Composable
         override fun buttonColors() = ButtonDefaults.buttonColors(
             contentColor = contentColor,
             containerColor = Color.Transparent,
-            disabledContentColor = LocalColors.current.disabled,
+            disabledContentColor = disabledColor ?: LocalColors.current.disabled,
             disabledContainerColor = Color.Transparent
         )
     }