diff --git a/qml/components/chatInformationPage/ChatInformationPageContent.qml b/qml/components/chatInformationPage/ChatInformationPageContent.qml index 06c9322..2c485e2 100644 --- a/qml/components/chatInformationPage/ChatInformationPageContent.qml +++ b/qml/components/chatInformationPage/ChatInformationPageContent.qml @@ -28,7 +28,6 @@ SilicaFlickable { property alias membersList: membersList function initializePage() { - console.log("[ChatInformationPage] Initializing chat info page..."); membersList.clear(); var chatType = chatInformation.type["@type"]; switch(chatType) { @@ -294,7 +293,7 @@ SilicaFlickable { id: contentFlickable contentHeight: groupInfoItem.height + tabViewLoader.height clip: true - interactive: true//groupInfoItem.height > pageContent.height * 0.5 + interactive: !scrollUpAnimation.running && !scrollDownAnimation.running anchors { top: headerItem.bottom @@ -435,7 +434,7 @@ SilicaFlickable { horizontalAlignment: Qt.AlignHCenter opacity: (tabViewLoader.status === Loader.Ready && tabViewLoader.item.count > 0) ? 1.0 : 0.0 - Behavior on opacity { PropertyAnimation {duration: 500}} + Behavior on opacity { FadeAnimation {}} } } diff --git a/qml/components/chatInformationPage/ChatInformationProfilePicture.qml b/qml/components/chatInformationPage/ChatInformationProfilePicture.qml index 6bdb47d..16753e7 100644 --- a/qml/components/chatInformationPage/ChatInformationProfilePicture.qml +++ b/qml/components/chatInformationPage/ChatInformationProfilePicture.qml @@ -25,7 +25,7 @@ Item { visible: imageContainer.tweenFactor > 0.8 && chatPictureDetail.imageStatus === Image.Ready property bool isActive: imageContainer.tweenFactor === 1.0 opacity: isActive ? 1.0 : 0.0 - Behavior on opacity { NumberAnimation {} } + Behavior on opacity { FadeAnimation {} } ProfileThumbnail { id: chatPictureDetail anchors.fill: parent diff --git a/qml/components/chatInformationPage/ChatInformationProfilePictureList.qml b/qml/components/chatInformationPage/ChatInformationProfilePictureList.qml index 8cbc677..f9586be 100644 --- a/qml/components/chatInformationPage/ChatInformationProfilePictureList.qml +++ b/qml/components/chatInformationPage/ChatInformationProfilePictureList.qml @@ -25,7 +25,7 @@ Item { property bool isActive: imageContainer.tweenFactor === 1.0 opacity: isActive ? 1.0 : 0.0 - Behavior on opacity { NumberAnimation {} } + Behavior on opacity { FadeAnimation {} } SlideshowView { id: bigProfilePictureList diff --git a/qml/components/chatInformationPage/ChatInformationTabItemBase.qml b/qml/components/chatInformationPage/ChatInformationTabItemBase.qml index 0ebdea4..8f152f6 100644 --- a/qml/components/chatInformationPage/ChatInformationTabItemBase.qml +++ b/qml/components/chatInformationPage/ChatInformationTabItemBase.qml @@ -35,8 +35,8 @@ Item { default property alias _data: contentItem.data - opacity: active ? 1.0 : 0.2 - Behavior on opacity { PropertyAnimation {duration: 300}} + opacity: active ? 1.0 : 0.0 + Behavior on opacity { FadeAnimation {}} Column { id: loadingColumn @@ -47,7 +47,7 @@ Item { topPadding: Theme.paddingLarge anchors.top: parent.top opacity: loadingVisible ? 1.0 : 0.0 - Behavior on opacity { NumberAnimation {} } + Behavior on opacity { FadeAnimation {} } visible: tabItem.loading InfoLabel { diff --git a/qml/components/chatInformationPage/ChatInformationTabItemMembersGroups.qml b/qml/components/chatInformationPage/ChatInformationTabItemMembersGroups.qml index 8e86e2d..befb266 100644 --- a/qml/components/chatInformationPage/ChatInformationTabItemMembersGroups.qml +++ b/qml/components/chatInformationPage/ChatInformationTabItemMembersGroups.qml @@ -40,7 +40,7 @@ ChatInformationTabItemBase { height: tabBase.height width: tabBase.width opacity: tabBase.loading ? (count > 0 ? 0.5 : 0.0) : 1.0 - Behavior on opacity { NumberAnimation {} } + Behavior on opacity { FadeAnimation {} } function handleScrollIntoView(force){ if(!tabBase.loading && !dragging && !quickScrollAnimating ) { if(!atYBeginning) { diff --git a/qml/components/chatInformationPage/ChatInformationTabView.qml b/qml/components/chatInformationPage/ChatInformationTabView.qml index e4779fe..f550821 100644 --- a/qml/components/chatInformationPage/ChatInformationTabView.qml +++ b/qml/components/chatInformationPage/ChatInformationTabView.qml @@ -61,8 +61,8 @@ Item { width: loaded ? (headerGrid.width / tabView.count) : 0 opacity: loaded ? 1.0 : 0.0 - Behavior on width { PropertyAnimation {duration: 300}} - Behavior on opacity { PropertyAnimation {duration: 300}} + Behavior on width { PropertyAnimation {duration: 200}} + Behavior on opacity { FadeAnimation {}} height: Theme.itemSizeLarge property int itemIndex: index property bool itemIsActive: tabView.currentIndex === itemIndex diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index a6afd7f..9e4acf8 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -299,7 +299,7 @@ Page { if (!chatPage.isInitialized) { chatModel.initialize(chatInformation); - pageStack.pushAttached(Qt.resolvedUrl("../pages/ChatInformationPage.qml"), { "chatInformation" : chatInformation, "privateChatUserInformation": chatPartnerInformation, "groupInformation": chatGroupInformation, "chatOnlineMemberCount": chatOnlineMemberCount}); + pageStack.pushAttached(Qt.resolvedUrl("ChatInformationPage.qml"), { "chatInformation" : chatInformation, "privateChatUserInformation": chatPartnerInformation, "groupInformation": chatGroupInformation, "chatOnlineMemberCount": chatOnlineMemberCount}); chatPage.isInitialized = true; } break;