Merge branch 'develop' into feat/disable-x86-support-cherry-pick

wireapp · Nov 27, 2024 · ca69ba1 · ca69ba1
2 parents 85163ab + 04c9a3d
commit ca69ba1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/...in/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsEmptyScreenText.kt b/...in/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsEmptyScreenText.kt
@@ -72,7 +72,7 @@ fun MessageDetailsEmptyScreenText(
                 append(learnMoreText)
                 addStyle(
                     style = SpanStyle(
-                        color = MaterialTheme.colorScheme.primary,
+                        color = MaterialTheme.colorScheme.onBackground,
                         textDecoration = TextDecoration.Underline
                     ),
                     start = 0,

diff --git a/...n/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsReactions.kt b/...n/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsReactions.kt
@@ -30,6 +30,7 @@ import com.wire.android.R
 import com.wire.android.ui.common.preview.MultipleThemePreviews
 import com.wire.android.ui.home.conversations.details.participants.folderWithElements
 import com.wire.android.ui.home.conversations.messagedetails.model.MessageDetailsReactionsData
+import com.wire.android.ui.theme.WireTheme
 
 @Composable
 fun MessageDetailsReactions(
@@ -69,8 +70,10 @@ fun MessageDetailsReactions(
 @MultipleThemePreviews
 @Composable
 fun PreviewMessageDetailsReactions() {
-    MessageDetailsReactions(
-        reactionsData = MessageDetailsReactionsData(),
-        onReactionsLearnMore = {}
-    )
+    WireTheme {
+        MessageDetailsReactions(
+            reactionsData = MessageDetailsReactionsData(),
+            onReactionsLearnMore = {}
+        )
+    }
 }
diff --git a/...otlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsReadReceipts.kt b/...otlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsReadReceipts.kt
@@ -26,10 +26,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import com.wire.android.R
+import com.wire.android.ui.common.preview.MultipleThemePreviews
 import com.wire.android.ui.home.conversations.details.participants.folderWithElements
 import com.wire.android.ui.home.conversations.messagedetails.model.MessageDetailsReadReceiptsData
+import com.wire.android.ui.theme.WireTheme
 
 @Composable
 fun MessageDetailsReadReceipts(
@@ -64,11 +65,13 @@ fun MessageDetailsReadReceipts(
     }
 }
 
-@Preview(showBackground = true)
+@MultipleThemePreviews
 @Composable
 fun PreviewMessageDetailsReadReceipts() {
-    MessageDetailsReadReceipts(
-        readReceiptsData = MessageDetailsReadReceiptsData(),
-        onReadReceiptsLearnMore = {}
-    )
+    WireTheme {
+        MessageDetailsReadReceipts(
+            readReceiptsData = MessageDetailsReadReceiptsData(),
+            onReadReceiptsLearnMore = {}
+        )
+    }
 }
diff --git a/...src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt b/...src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt
@@ -109,7 +109,6 @@ fun SystemMessageItem(
                     text = annotatedString,
                     linkText = learnMoreLink?.let { stringResource(id = R.string.label_learn_more) },
                     textColor = MaterialTheme.wireColorScheme.secondaryText,
-                    linkColor = MaterialTheme.wireColorScheme.onBackground,
                     onLinkClick = { learnMoreLink?.let { CustomTabsHelper.launchUrl(context, it) } },
                     onTextLayout = {
                         centerOfFirstLine = if (it.lineCount == 0) 0f else ((it.getLineTop(0) + it.getLineBottom(0)) / 2)

diff --git a/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt b/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt
@@ -441,7 +441,8 @@ fun FileSharingRestrictedContent(
                         annotation = learnMoreUrl,
                         onClick = { CustomTabsHelper.launchUrl(context, learnMoreUrl) }
                     )
-                )
+                ),
+                textColor = colorsScheme().onBackground
             )
         }
     }

diff --git a/core/ui-common/src/main/kotlin/com/wire/android/ui/common/TextWithLinkSuffix.kt b/core/ui-common/src/main/kotlin/com/wire/android/ui/common/TextWithLinkSuffix.kt
@@ -58,7 +58,7 @@ fun TextWithLinkSuffix(
     textStyle: TextStyle = MaterialTheme.wireTypography.body01,
     textColor: Color = MaterialTheme.wireColorScheme.onBackground,
     linkStyle: TextStyle = MaterialTheme.wireTypography.body02,
-    linkColor: Color = MaterialTheme.wireColorScheme.primary,
+    linkColor: Color = MaterialTheme.wireColorScheme.onBackground,
     linkDecoration: TextDecoration = TextDecoration.Underline,
     onTextLayout: (TextLayoutResult) -> Unit = {}
 ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -441,7 +441,8 @@ fun FileSharingRestrictedContent( @@
                             annotation = learnMoreUrl,
                             onClick = { CustomTabsHelper.launchUrl(context, learnMoreUrl) }
                         )
-                    )
+                    ),
+                    textColor = colorsScheme().onBackground
                 )
             }
         }
@@ Expand Down @@