Add Animated images to chat and notifications.

Higher chat bubbles when thumbnails can be shown.

linphone-app/src/utils/Utils.cpp

@@ -527,3 +527,11 @@ bool Utils::isMe(const QString& address){
 bool Utils::isMe(const std::shared_ptr<const linphone::Address>& address){
 	return address ? CoreManager::getInstance()->getAccountSettingsModel()->getUsedSipAddress()->weakEqual(address) : false;
 }
+
+bool Utils::isAnimatedImage(const QString& path){
+	QFileInfo info(path);
+	if( !info.exists())
+		return false;
+	QImageReader reader(path);
+	return reader.supportsAnimation() && reader.imageCount() > 1;
+}

linphone-app/src/utils/Utils.hpp

@@ -60,6 +60,7 @@ public:
 	Q_INVOKABLE static QString getDisplayName(const QString& address);
 	Q_INVOKABLE static QString toString(const LinphoneEnums::TunnelMode& mode);
 	Q_INVOKABLE static bool isMe(const QString& address);
+	Q_INVOKABLE static bool isAnimatedImage(const QString& path);
 //----------------------------------------------------------------------------------
 	
 	static inline QString coreStringToAppString (const std::string &str) {

linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml

@@ -9,6 +9,7 @@ import Linphone.Styles 1.0
 import Utils 1.0
 import Units 1.0
 import ColorsList 1.0
+import UtilsCpp 1.0
 
 // =============================================================================
 // TODO : into Loader
@@ -51,7 +52,7 @@ Row {
 				property string thumbnail :  mainRow.contentModel ? mainRow.contentModel.thumbnail : ''
 				color: 'transparent'
 				
-				height: ChatStyle.entry.message.file.height
+				height: thumbnail ? ChatStyle.entry.message.file.heightWithThumbnail : ChatStyle.entry.message.file.height
 				width: mainRow.width
 				
 				radius: ChatStyle.entry.message.radius
@@ -77,8 +78,20 @@ Row {
 							mipmap: SettingsModel.mipmapEnabled
 							source: mainRow.contentModel.thumbnail
 							fillMode: Image.PreserveAspectFit
-							sourceSize.width: 100
+							//sourceSize.width: 200
-							sourceSize.height: 100
+							//sourceSize.height: 100
+						}
+					}
+					Component {
+						id: animatedImage
+						
+						AnimatedImage {
+							id: animatedImageSource
+							mipmap: SettingsModel.mipmapEnabled
+							source: 'file:/'+mainRow.contentModel.filePath
+							fillMode: Image.PreserveAspectFit
+							//width: 200
+							//height: 100
 						}
 					}
 					
@@ -105,9 +118,13 @@ Row {
 						id: thumbnailProvider
 						
 						Layout.fillHeight: true
-						Layout.preferredWidth: parent.height
+						Layout.preferredWidth: parent.height*4/3
 						
-						sourceComponent: (mainRow.contentModel ? (mainRow.contentModel.thumbnail ? thumbnailImage : extension ): undefined)
+						sourceComponent: (mainRow.contentModel ? 
+							(mainRow.contentModel.wasDownloaded && UtilsCpp.isAnimatedImage(mainRow.contentModel.filePath) 
+								? animatedImage
+							:  (mainRow.contentModel.thumbnail ? thumbnailImage : extension )
+							) : undefined)
 						
 						ScaleAnimator {
 							id: thumbnailProviderAnimator

linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml

@@ -6,6 +6,8 @@ import Linphone 1.0
 import Linphone.Styles 1.0
 import Utils 1.0
 
+import UtilsCpp 1.0
+
 // =============================================================================
 
 Notification {
@@ -18,6 +20,7 @@ Notification {
 	
 	readonly property string fileUri: notificationData && notificationData.fileUri || ''
 	readonly property string imageUri: notificationData && notificationData.imageUri || ''
+	property string systemFileUri: Utils.getUriFromSystemPath(notification.fileUri)
 	
 	// ---------------------------------------------------------------------------
 	
@@ -41,17 +44,34 @@ Notification {
 				elide: Text.ElideRight
 				font.pointSize: NotificationReceivedFileMessageStyle.fileName.pointSize
 				text: Utils.basename(notification.fileUri)
-        visible:!image.visible
+				visible:!normalImage.visible && !animatedImage.visible
 			}
+			Loader{
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+				
+				sourceComponent: notification.fileUri && UtilsCpp.isAnimatedImage(notification.fileUri) ? animatedImage : normalImage
+				active: fileUri || imageUri
+				Component{
+					id: normalImage
 					Image{
 						id:image
 						mipmap: SettingsModel.mipmapEnabled
-        Layout.fillHeight: true
-        Layout.fillWidth: true
 						fillMode: Image.PreserveAspectFit
 						source: (imageUri ?"image://external/"+notification.imageUri : '')
 						visible: image.status == Image.Ready
 					}
+				}
+				Component{
+					id: animatedImage
+					AnimatedImage{
+						id:image
+						mipmap: SettingsModel.mipmapEnabled
+						fillMode: Image.PreserveAspectFit
+						source: (systemFileUri ? systemFileUri: '')
+					}
+				}
+			}
 			
 			Text {
 				Layout.preferredWidth: NotificationReceivedFileMessageStyle.fileSize.width
@@ -68,9 +88,8 @@ Notification {
 			anchors.fill: parent
 			
 			onClicked: notification._close(function () {
-        var uri = Utils.getUriFromSystemPath(notification.fileUri)
+				if (!Qt.openUrlExternally(systemFileUri)) {
-        if (!Qt.openUrlExternally(uri)) {
+					Qt.openUrlExternally(Utils.dirname(systemFileUri))
-          Qt.openUrlExternally(Utils.dirname(uri))
 				}
 			})
 		}

linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml

@@ -183,6 +183,7 @@ QtObject {
 			
 			property QtObject file: QtObject {
 				property int height: 64
+				property int heightWithThumbnail: 200
 				property int iconSize: 18
 				property int margins: 8
 				property int spacing: 8