2020-08-28 15:14:05 +03:00
|
|
|
/*
|
2020-10-19 20:34:47 +03:00
|
|
|
Copyright (C) 2020 Sebastian J. Wolf and other contributors
|
2020-08-28 15:14:05 +03:00
|
|
|
|
|
|
|
This file is part of Fernschreiber.
|
|
|
|
|
|
|
|
Fernschreiber is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
Fernschreiber is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
import QtQuick 2.0
|
|
|
|
import Sailfish.Silica 1.0
|
|
|
|
import QtMultimedia 5.0
|
|
|
|
import "../js/functions.js" as Functions
|
|
|
|
|
|
|
|
Item {
|
|
|
|
id: audioMessageComponent
|
|
|
|
|
Reduce ChatPage.qml jit compile time
First of all: Take all measurements I mention with a grain of salt – all of them are rough and not necessarily measured more than a few times. All times were measured on an Xperia X run via SDK.
Visiting a chat page can take a long time, especially before the qml is cached by the engine.
When opening it for the first time after application launch, it sometimes takes >1000ms from onClicked (OverviewPage) to Component.OnCompleted (Chatpage).
Subsequent activations take roughly 470-480ms.
With these changes, I was able to reduce these times to ~450ms for the first, ~100ms for subsequent activations of the ChatPage on my test device.
Things changed:
- The components for displaying extra content to a message are (mostly) gone and replaced by a single Loader. This Loader does not use sourceComponent to trade the initial compilation boost for a neglegible bit of runtime penalty.
- Connections were consolidated
- I was surprised how costly the inclusion of the RemorseItem was (compiling ~75ms, initializing up to ~20ms for every delegate). So I traded a bit for a compromise. deleteMessageRemorseItem is now defined on the appWindow level, where it gets a bit mitigated by the animations at application start. Also, only one deletion at a time is now possible. We can easily revert this change, but I thought it worthwhile despite its drawbacks.
- profileThumbnailComponent is now defined directly as sourceComponent, removing the need for its id. Probably didn't do anything.
- InReplyToRow had width: parent.width, so I removed horizontalCenter. Also probably didn't change compilation time at all.
- Another compromise I was willing to take – your opinion may differ: The PickerPages took ages (~200ms) to just parse/compile inside those Components, so I replaced them with the "string notation" of pageStack.push. Drawback: The first time a picker gets activated, you'll see how slow it is. Subsequent activations aren't that bad – also for the other pickers.
2020-10-30 22:36:32 +03:00
|
|
|
property ListItem messageListItem
|
|
|
|
property variant rawMessage: messageListItem.myMessage
|
|
|
|
|
|
|
|
property variant audioData: ( rawMessage.content['@type'] === "messageVoiceNote" ) ? rawMessage.content.voice_note : ( ( rawMessage.content['@type'] === "messageAudio" ) ? rawMessage.content.audio : "");
|
2020-08-28 15:14:05 +03:00
|
|
|
property string audioUrl;
|
|
|
|
property int previewFileId;
|
|
|
|
property int audioFileId;
|
Reduce ChatPage.qml jit compile time
First of all: Take all measurements I mention with a grain of salt – all of them are rough and not necessarily measured more than a few times. All times were measured on an Xperia X run via SDK.
Visiting a chat page can take a long time, especially before the qml is cached by the engine.
When opening it for the first time after application launch, it sometimes takes >1000ms from onClicked (OverviewPage) to Component.OnCompleted (Chatpage).
Subsequent activations take roughly 470-480ms.
With these changes, I was able to reduce these times to ~450ms for the first, ~100ms for subsequent activations of the ChatPage on my test device.
Things changed:
- The components for displaying extra content to a message are (mostly) gone and replaced by a single Loader. This Loader does not use sourceComponent to trade the initial compilation boost for a neglegible bit of runtime penalty.
- Connections were consolidated
- I was surprised how costly the inclusion of the RemorseItem was (compiling ~75ms, initializing up to ~20ms for every delegate). So I traded a bit for a compromise. deleteMessageRemorseItem is now defined on the appWindow level, where it gets a bit mitigated by the animations at application start. Also, only one deletion at a time is now possible. We can easily revert this change, but I thought it worthwhile despite its drawbacks.
- profileThumbnailComponent is now defined directly as sourceComponent, removing the need for its id. Probably didn't do anything.
- InReplyToRow had width: parent.width, so I removed horizontalCenter. Also probably didn't change compilation time at all.
- Another compromise I was willing to take – your opinion may differ: The PickerPages took ages (~200ms) to just parse/compile inside those Components, so I replaced them with the "string notation" of pageStack.push. Drawback: The first time a picker gets activated, you'll see how slow it is. Subsequent activations aren't that bad – also for the other pickers.
2020-10-30 22:36:32 +03:00
|
|
|
property bool onScreen: messageListItem.page.status === PageStatus.Active
|
2020-08-28 15:14:05 +03:00
|
|
|
property string audioType : "voiceNote";
|
|
|
|
|
|
|
|
width: parent.width
|
Reduce ChatPage.qml jit compile time
First of all: Take all measurements I mention with a grain of salt – all of them are rough and not necessarily measured more than a few times. All times were measured on an Xperia X run via SDK.
Visiting a chat page can take a long time, especially before the qml is cached by the engine.
When opening it for the first time after application launch, it sometimes takes >1000ms from onClicked (OverviewPage) to Component.OnCompleted (Chatpage).
Subsequent activations take roughly 470-480ms.
With these changes, I was able to reduce these times to ~450ms for the first, ~100ms for subsequent activations of the ChatPage on my test device.
Things changed:
- The components for displaying extra content to a message are (mostly) gone and replaced by a single Loader. This Loader does not use sourceComponent to trade the initial compilation boost for a neglegible bit of runtime penalty.
- Connections were consolidated
- I was surprised how costly the inclusion of the RemorseItem was (compiling ~75ms, initializing up to ~20ms for every delegate). So I traded a bit for a compromise. deleteMessageRemorseItem is now defined on the appWindow level, where it gets a bit mitigated by the animations at application start. Also, only one deletion at a time is now possible. We can easily revert this change, but I thought it worthwhile despite its drawbacks.
- profileThumbnailComponent is now defined directly as sourceComponent, removing the need for its id. Probably didn't do anything.
- InReplyToRow had width: parent.width, so I removed horizontalCenter. Also probably didn't change compilation time at all.
- Another compromise I was willing to take – your opinion may differ: The PickerPages took ages (~200ms) to just parse/compile inside those Components, so I replaced them with the "string notation" of pageStack.push. Drawback: The first time a picker gets activated, you'll see how slow it is. Subsequent activations aren't that bad – also for the other pickers.
2020-10-30 22:36:32 +03:00
|
|
|
height: width / 2
|
2020-08-28 15:14:05 +03:00
|
|
|
|
|
|
|
function getTimeString(rawSeconds) {
|
|
|
|
var minutes = Math.floor( rawSeconds / 60 );
|
|
|
|
var seconds = rawSeconds - ( minutes * 60 );
|
|
|
|
|
|
|
|
if ( minutes < 10 ) {
|
|
|
|
minutes = "0" + minutes;
|
|
|
|
}
|
|
|
|
if ( seconds < 10 ) {
|
|
|
|
seconds = "0" + seconds;
|
|
|
|
}
|
|
|
|
return minutes + ":" + seconds;
|
|
|
|
}
|
|
|
|
|
|
|
|
Component.onCompleted: {
|
|
|
|
updateAudioThumbnail();
|
|
|
|
}
|
|
|
|
|
|
|
|
function updateAudioThumbnail() {
|
2020-08-29 17:58:48 +03:00
|
|
|
if (audioData) {
|
2020-08-28 15:14:05 +03:00
|
|
|
audioType = ( audioData['@type'] === "voiceNote" ) ? "voice" : "audio";
|
|
|
|
audioFileId = audioData[audioType].id;
|
|
|
|
if (typeof audioData.album_cover_thumbnail !== "undefined") {
|
|
|
|
previewFileId = audioData.album_cover_thumbnail.photo.id;
|
|
|
|
if (audioData.album_cover_thumbnail.photo.local.is_downloading_completed) {
|
|
|
|
placeholderImage.source = audioData.album_cover_thumbnail.photo.local.path;
|
|
|
|
} else {
|
|
|
|
tdLibWrapper.downloadFile(previewFileId);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
placeholderImage.source = "image://theme/icon-l-music?white";
|
|
|
|
placeholderImage.width = Theme.itemSizeLarge
|
|
|
|
placeholderImage.height = Theme.itemSizeLarge
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function handlePlay() {
|
|
|
|
if (audioData[audioType].local.is_downloading_completed) {
|
|
|
|
audioUrl = audioData[audioType].local.path;
|
|
|
|
audioComponentLoader.active = true;
|
|
|
|
} else {
|
|
|
|
audioDownloadBusyIndicator.running = true;
|
|
|
|
tdLibWrapper.downloadFile(audioFileId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Connections {
|
|
|
|
target: tdLibWrapper
|
|
|
|
onFileUpdated: {
|
|
|
|
if (typeof audioData === "object") {
|
|
|
|
if (fileInformation.local.is_downloading_completed) {
|
|
|
|
if (fileId === previewFileId) {
|
|
|
|
audioData.thumbnail.photo = fileInformation;
|
|
|
|
placeholderImage.source = fileInformation.local.path;
|
|
|
|
}
|
|
|
|
if (fileId === audioFileId) {
|
|
|
|
audioDownloadBusyIndicator.running = false;
|
|
|
|
audioData[audioType] = fileInformation;
|
|
|
|
audioUrl = fileInformation.local.path;
|
|
|
|
if (onScreen) {
|
|
|
|
audioComponentLoader.active = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Image {
|
|
|
|
id: placeholderImage
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
anchors.centerIn: parent
|
2020-08-29 17:32:43 +03:00
|
|
|
asynchronous: true
|
2020-08-28 15:14:05 +03:00
|
|
|
fillMode: Image.PreserveAspectCrop
|
|
|
|
visible: status === Image.Ready ? true : false
|
|
|
|
}
|
|
|
|
|
2020-10-26 17:15:53 +03:00
|
|
|
BackgroundImage {
|
2020-08-28 15:14:05 +03:00
|
|
|
visible: placeholderImage.status !== Image.Ready
|
|
|
|
}
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
id: placeholderBackground
|
|
|
|
color: "black"
|
|
|
|
opacity: 0.3
|
|
|
|
height: parent.height
|
|
|
|
width: parent.width
|
|
|
|
visible: playButton.visible
|
|
|
|
}
|
|
|
|
|
|
|
|
Row {
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
Item {
|
|
|
|
height: parent.height
|
|
|
|
width: parent.width
|
|
|
|
Image {
|
|
|
|
id: playButton
|
|
|
|
anchors.centerIn: parent
|
|
|
|
width: Theme.iconSizeLarge
|
|
|
|
height: Theme.iconSizeLarge
|
|
|
|
source: "image://theme/icon-l-play?white"
|
2020-08-29 17:32:43 +03:00
|
|
|
asynchronous: true
|
2020-08-28 15:14:05 +03:00
|
|
|
visible: placeholderImage.status === Image.Ready ? true : false
|
|
|
|
MouseArea {
|
|
|
|
anchors.fill: parent
|
|
|
|
onClicked: {
|
|
|
|
handlePlay();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BusyIndicator {
|
|
|
|
id: audioDownloadBusyIndicator
|
|
|
|
running: false
|
|
|
|
visible: running
|
|
|
|
anchors.centerIn: parent
|
|
|
|
size: BusyIndicatorSize.Large
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
id: audioErrorShade
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
color: "lightgrey"
|
|
|
|
visible: placeholderImage.status === Image.Error ? true : false
|
|
|
|
opacity: 0.3
|
|
|
|
}
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
id: errorTextOverlay
|
|
|
|
color: "black"
|
|
|
|
opacity: 0.8
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
visible: false
|
|
|
|
}
|
|
|
|
|
|
|
|
Text {
|
|
|
|
id: errorText
|
|
|
|
visible: false
|
|
|
|
width: parent.width
|
|
|
|
color: Theme.primaryColor
|
|
|
|
font.pixelSize: Theme.fontSizeExtraSmall
|
|
|
|
horizontalAlignment: Text.AlignHCenter
|
|
|
|
anchors {
|
|
|
|
verticalCenter: parent.verticalCenter
|
|
|
|
}
|
|
|
|
wrapMode: Text.Wrap
|
|
|
|
text: ""
|
|
|
|
}
|
|
|
|
|
|
|
|
Loader {
|
|
|
|
id: audioComponentLoader
|
|
|
|
active: false
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
sourceComponent: audioComponent
|
|
|
|
}
|
|
|
|
|
|
|
|
Component {
|
|
|
|
id: audioComponent
|
|
|
|
|
|
|
|
Item {
|
|
|
|
width: parent ? parent.width : 0
|
|
|
|
height: parent ? parent.height : 0
|
|
|
|
|
|
|
|
Connections {
|
|
|
|
target: messageAudio
|
|
|
|
onPlaying: {
|
|
|
|
playButton.visible = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Audio {
|
|
|
|
id: messageAudio
|
|
|
|
|
|
|
|
Component.onCompleted: {
|
|
|
|
if (messageAudio.error === MediaPlayer.NoError) {
|
|
|
|
messageAudio.play();
|
|
|
|
timeLeftTimer.start();
|
|
|
|
} else {
|
|
|
|
errorText.text = qsTr("Error loading audio! " + messageAudio.errorString)
|
|
|
|
errorTextOverlay.visible = true;
|
|
|
|
errorText.visible = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
onStatusChanged: {
|
|
|
|
if (status == MediaPlayer.NoMedia) {
|
|
|
|
console.log("No Media");
|
|
|
|
audioBusyIndicator.visible = false;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.Loading) {
|
|
|
|
console.log("Loading");
|
|
|
|
audioBusyIndicator.visible = true;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.Loaded) {
|
|
|
|
console.log("Loaded");
|
|
|
|
audioBusyIndicator.visible = false;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.Buffering) {
|
|
|
|
console.log("Buffering");
|
|
|
|
audioBusyIndicator.visible = true;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.Stalled) {
|
|
|
|
console.log("Stalled");
|
|
|
|
audioBusyIndicator.visible = true;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.Buffered) {
|
|
|
|
console.log("Buffered");
|
|
|
|
audioBusyIndicator.visible = false;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.EndOfMedia) {
|
|
|
|
console.log("End of Media");
|
|
|
|
audioBusyIndicator.visible = false;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.InvalidMedia) {
|
|
|
|
console.log("Invalid Media");
|
|
|
|
audioBusyIndicator.visible = false;
|
|
|
|
}
|
|
|
|
if (status == MediaPlayer.UnknownStatus) {
|
|
|
|
console.log("Unknown Status");
|
|
|
|
audioBusyIndicator.visible = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
source: audioUrl
|
|
|
|
|
|
|
|
onStopped: {
|
|
|
|
playButton.visible = true;
|
|
|
|
audioComponentLoader.active = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MouseArea {
|
|
|
|
anchors.fill: parent
|
|
|
|
onClicked: {
|
|
|
|
if (messageAudio.playbackState === MediaPlayer.PlayingState) {
|
|
|
|
messageAudio.pause();
|
|
|
|
timeLeftItem.visible = true;
|
|
|
|
} else {
|
|
|
|
messageAudio.play();
|
|
|
|
timeLeftTimer.start();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BusyIndicator {
|
|
|
|
id: audioBusyIndicator
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
|
|
visible: false
|
|
|
|
running: visible
|
|
|
|
size: BusyIndicatorSize.Medium
|
|
|
|
}
|
|
|
|
|
|
|
|
Timer {
|
|
|
|
id: timeLeftTimer
|
|
|
|
repeat: false
|
|
|
|
interval: 2000
|
|
|
|
onTriggered: {
|
|
|
|
timeLeftItem.visible = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Item {
|
|
|
|
id: timeLeftItem
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
anchors.bottom: parent.bottom
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
|
|
opacity: visible ? 1 : 0
|
|
|
|
Behavior on opacity { NumberAnimation {} }
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
id: positionTextOverlay
|
|
|
|
color: "black"
|
|
|
|
opacity: 0.3
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
|
|
|
anchors.bottom: parent.bottom
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
|
|
visible: pausedRow.visible
|
|
|
|
}
|
|
|
|
|
|
|
|
Row {
|
|
|
|
id: pausedRow
|
|
|
|
width: parent.width
|
|
|
|
height: parent.height - ( messageAudioSlider.visible ? messageAudioSlider.height : 0 ) - ( positionText.visible ? positionText.height : 0 )
|
|
|
|
visible: audioComponentLoader.active && messageAudio.playbackState === MediaPlayer.PausedState
|
|
|
|
Item {
|
|
|
|
height: parent.height
|
|
|
|
width: parent.width
|
|
|
|
Image {
|
|
|
|
id: pausedPlayButton
|
|
|
|
anchors.centerIn: parent
|
|
|
|
width: Theme.iconSizeLarge
|
|
|
|
height: Theme.iconSizeLarge
|
2020-08-29 17:32:43 +03:00
|
|
|
asynchronous: true
|
2020-08-28 15:14:05 +03:00
|
|
|
source: "image://theme/icon-l-play?white"
|
|
|
|
MouseArea {
|
|
|
|
anchors.fill: parent
|
|
|
|
onClicked: {
|
|
|
|
messageAudio.play();
|
|
|
|
timeLeftTimer.start();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Slider {
|
|
|
|
id: messageAudioSlider
|
|
|
|
width: parent.width
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
|
|
anchors.bottom: positionText.top
|
|
|
|
minimumValue: 0
|
|
|
|
maximumValue: messageAudio.duration ? messageAudio.duration : 0
|
|
|
|
stepSize: 1
|
|
|
|
value: messageAudio.position
|
|
|
|
enabled: messageAudio.seekable
|
|
|
|
visible: (messageAudio.duration > 0)
|
|
|
|
onReleased: {
|
|
|
|
messageAudio.seek(Math.floor(value));
|
|
|
|
messageAudio.play();
|
|
|
|
timeLeftTimer.start();
|
|
|
|
}
|
|
|
|
valueText: getTimeString(Math.round((messageAudio.duration - messageAudioSlider.value) / 1000))
|
|
|
|
}
|
|
|
|
|
|
|
|
Text {
|
|
|
|
id: positionText
|
|
|
|
visible: messageAudio.duration === 0
|
|
|
|
color: Theme.primaryColor
|
|
|
|
font.pixelSize: Theme.fontSizeTiny
|
|
|
|
anchors {
|
|
|
|
bottom: parent.bottom
|
|
|
|
bottomMargin: Theme.paddingSmall
|
|
|
|
horizontalCenter: positionTextOverlay.horizontalCenter
|
|
|
|
}
|
|
|
|
wrapMode: Text.Wrap
|
|
|
|
text: ( messageAudio.duration - messageAudio.position ) > 0 ? getTimeString(Math.round((messageAudio.duration - messageAudio.position) / 1000)) : "-:-"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|