lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-23 14:42:02 +02:00
Code Activity

preview: fix undefined domain for twitter and color with luma

Browse source 
Change-Id: I28a5d02881b9b5eb57ad6efa646dd1c5a3327856
GitLab: #670
This commit is contained in:
Sébastien Blin 2022-04-27 16:33:10 -04:00
parent 920bb44a3f
commit 5337ede589
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/misc/previewInterop.js
View file

@ -24,13 +24,13 @@ function getPreviewInfo(messageId, url) {
var doc = parser.parseFromString(html, "text/html") var doc = parser.parseFromString(html, "text/html")
if (!url.includes("twitter.com")){ if (!url.includes("twitter.com")){
title = getTitle(doc) title = getTitle(doc)
} else {
title = "Twitter. It's what's happening."
}
image = getImage(doc, url) image = getImage(doc, url)
description = getDescription(doc) description = getDescription(doc)
var domain = (new URL(url)) var domain = (new URL(url))
domain = (domain.hostname).replace("www.", "") domain = (domain.hostname).replace("www.", "")
} else {
title = "Twitter. It's what's happening."
}
window.jsbridge.emitInfoReady(messageId, { window.jsbridge.emitInfoReady(messageId, {
'title': title, 'title': title,

12
src/commoncomponents/TextMessageDelegate.qml
View file

@ -148,7 +148,9 @@ SBSMessageBase {
wrapMode: Label.WrapAtWordBoundaryOrAnywhere wrapMode: Label.WrapAtWordBoundaryOrAnywhere
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
color: JamiTheme.previewTitleColor color: UtilsAdapter.luma(bubble.color) ?
JamiTheme.chatviewTextColorLight :
JamiTheme.chatviewTextColorDark
visible: LinkPreviewInfo.title !== null visible: LinkPreviewInfo.title !== null
text: LinkPreviewInfo.title text: LinkPreviewInfo.title
} }
@ -159,7 +161,9 @@ SBSMessageBase {
wrapMode: Label.WrapAtWordBoundaryOrAnywhere wrapMode: Label.WrapAtWordBoundaryOrAnywhere
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
color: JamiTheme.previewSubtitleColor color: UtilsAdapter.luma(bubble.color) ?
JamiTheme.chatviewTextColorLight :
JamiTheme.chatviewTextColorDark
visible: LinkPreviewInfo.description !== null visible: LinkPreviewInfo.description !== null
text: '<a href=" " style="text-decoration: ' + text: '<a href=" " style="text-decoration: ' +
( hoveredLink ? 'underline' : 'none') + ';"' + ( hoveredLink ? 'underline' : 'none') + ';"' +
@ -172,7 +176,9 @@ SBSMessageBase {
wrapMode: Label.WrapAtWordBoundaryOrAnywhere wrapMode: Label.WrapAtWordBoundaryOrAnywhere
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
color: JamiTheme.previewSubtitleColor color: UtilsAdapter.luma(bubble.color) ?
JamiTheme.chatviewTextColorLight :
JamiTheme.chatviewTextColorDark
text: LinkPreviewInfo.domain text: LinkPreviewInfo.domain
} }
} }

2
src/constant/JamiTheme.qml
View file

@ -175,8 +175,6 @@ Item {
property color chatviewButtonColor: darkTheme ? whiteColor : blackColor property color chatviewButtonColor: darkTheme ? whiteColor : blackColor
property color bgTextInput: darkTheme ? "#060608" : whiteColor property color bgTextInput: darkTheme ? "#060608" : whiteColor
property color previewTextContainerColor: darkTheme ? "#959595" : "#ececec" property color previewTextContainerColor: darkTheme ? "#959595" : "#ececec"
property color previewTitleColor: darkTheme ? whiteColor : blackColor
property color previewSubtitleColor: darkTheme ? whiteColor : blackColor
property color previewImageBackgroundColor: whiteColor property color previewImageBackgroundColor: whiteColor
property color previewCardContainerColor : darkTheme ? blackColor : whiteColor property color previewCardContainerColor : darkTheme ? blackColor : whiteColor
property color previewUrlColor : darkTheme ? "#eeeeee" : "#333" property color previewUrlColor : darkTheme ? "#eeeeee" : "#333"