diff --git a/resources/misc/previewInterop.js b/resources/misc/previewInterop.js index 552c8b0d890c823cb3de53dfbcaa56526958ebc0..375ff60c4906ab2763be78b78ec0e19ef217b6b8 100644 --- a/resources/misc/previewInterop.js +++ b/resources/misc/previewInterop.js @@ -24,13 +24,13 @@ function getPreviewInfo(messageId, url) { var doc = parser.parseFromString(html, "text/html") if (!url.includes("twitter.com")){ title = getTitle(doc) - image = getImage(doc, url) - description = getDescription(doc) - var domain = (new URL(url)) - domain = (domain.hostname).replace("www.", "") } else { title = "Twitter. It's what's happening." } + image = getImage(doc, url) + description = getDescription(doc) + var domain = (new URL(url)) + domain = (domain.hostname).replace("www.", "") window.jsbridge.emitInfoReady(messageId, { 'title': title, diff --git a/src/commoncomponents/TextMessageDelegate.qml b/src/commoncomponents/TextMessageDelegate.qml index b8ed177413d2913306c5e7e0da3824dca79787f4..abe8e3feb14801666291833da5d0841971ee0e71 100644 --- a/src/commoncomponents/TextMessageDelegate.qml +++ b/src/commoncomponents/TextMessageDelegate.qml @@ -148,7 +148,9 @@ SBSMessageBase { wrapMode: Label.WrapAtWordBoundaryOrAnywhere renderType: Text.NativeRendering textFormat: TextEdit.RichText - color: JamiTheme.previewTitleColor + color: UtilsAdapter.luma(bubble.color) ? + JamiTheme.chatviewTextColorLight : + JamiTheme.chatviewTextColorDark visible: LinkPreviewInfo.title !== null text: LinkPreviewInfo.title } @@ -159,7 +161,9 @@ SBSMessageBase { wrapMode: Label.WrapAtWordBoundaryOrAnywhere renderType: Text.NativeRendering textFormat: TextEdit.RichText - color: JamiTheme.previewSubtitleColor + color: UtilsAdapter.luma(bubble.color) ? + JamiTheme.chatviewTextColorLight : + JamiTheme.chatviewTextColorDark visible: LinkPreviewInfo.description !== null text: '<a href=" " style="text-decoration: ' + ( hoveredLink ? 'underline' : 'none') + ';"' + @@ -172,7 +176,9 @@ SBSMessageBase { wrapMode: Label.WrapAtWordBoundaryOrAnywhere renderType: Text.NativeRendering textFormat: TextEdit.RichText - color: JamiTheme.previewSubtitleColor + color: UtilsAdapter.luma(bubble.color) ? + JamiTheme.chatviewTextColorLight : + JamiTheme.chatviewTextColorDark text: LinkPreviewInfo.domain } } diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml index 8c21b923eae4ffd4120b2c915f8ca7415c424abd..e8dfc606ceec680469c3e65601b0d380d10ceb9f 100644 --- a/src/constant/JamiTheme.qml +++ b/src/constant/JamiTheme.qml @@ -175,8 +175,6 @@ Item { property color chatviewButtonColor: darkTheme ? whiteColor : blackColor property color bgTextInput: darkTheme ? "#060608" : whiteColor property color previewTextContainerColor: darkTheme ? "#959595" : "#ececec" - property color previewTitleColor: darkTheme ? whiteColor : blackColor - property color previewSubtitleColor: darkTheme ? whiteColor : blackColor property color previewImageBackgroundColor: whiteColor property color previewCardContainerColor : darkTheme ? blackColor : whiteColor property color previewUrlColor : darkTheme ? "#eeeeee" : "#333"