Merge pull request #208 from ioriayane/Release/v0.29.0

Release/v0.29.0

app/app.pro

@@ -57,6 +57,7 @@ QML_FILES = \
     qml/parts/ListLinkCard.qml \
     qml/parts/MentionSuggestionView.qml \
     qml/parts/NotificationDelegate.qml \
+    qml/parts/PinnedIndicator.qml \
     qml/parts/PostControls.qml \
     qml/parts/PostDelegate.qml \
     qml/parts/PostInformation.qml \
@@ -92,6 +93,7 @@ IMAGE_FILES += \
     qml/images/arrow_left_double.png \
     qml/images/arrow_left_single.png \
     qml/images/auto.png \
+    qml/images/database.png \
     qml/images/block.png \
     qml/images/bookmark_add.png \
     qml/images/check.png \
@@ -117,6 +119,7 @@ IMAGE_FILES += \
     qml/images/mute.png \
     qml/images/notification.png \
     qml/images/open_in_other.png \
+    qml/images/pin.png \
     qml/images/quote.png \
     qml/images/refresh.png \
     qml/images/reply.png \

app/main.cpp

@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName(QStringLiteral("relog"));
     app.setOrganizationDomain(QStringLiteral("hagoromo.relog.tech"));
     app.setApplicationName(QStringLiteral("Hagoromo"));
-    app.setApplicationVersion(QStringLiteral("0.28.0"));
+    app.setApplicationVersion(QStringLiteral("0.29.0"));
 #ifndef HAGOROMO_RELEASE_BUILD
     app.setApplicationVersion(app.applicationVersion() + "d");
 #endif

app/qml/data/AdjustedValues.qml

@@ -22,6 +22,7 @@ QtObject {
     property real i18: 18 * ratio
     property real i16: 16 * ratio
     property real i12: 12 * ratio
+    property real i10: 10 * ratio
 
     // for Font
     property real f14: 14 * ratio

app/qml/dialogs/LoginDialog.qml

@@ -20,11 +20,17 @@ Dialog {
 
     signal errorOccured(string code, string message)
 
+    onClosed: {
+        mfaCodeTextInput.visible = false
+        mfaCodeTextInput.text = ""
+    }
+
     CreateSession {
         id: session
         service: serviceTextInput.text
         identifier: idTextInput.text
         password: passwordTextInput.text
+        authFactorToken: mfaCodeTextInput.text
 
         onFinished: (success) => {
                       if(success){
@@ -33,7 +39,14 @@ Dialog {
                           // NG
                       }
                   }
-        onErrorOccured: (code, message) => loginDialog.errorOccured(code, message)
+        onErrorOccured: (code, message) => {
+                            if(code === "AuthFactorTokenRequired"){
+                                mfaCodeTextInput.text = ""
+                                mfaCodeTextInput.visible = true
+                            }else{
+                                loginDialog.errorOccured(code, message)
+                            }
+                        }
     }
 
     GridLayout {
@@ -75,6 +88,20 @@ Dialog {
             placeholderText: "The use of App Password is recommended."
             font.pointSize: AdjustedValues.f10
         }
+        Label {
+            font.pointSize: AdjustedValues.f10
+            text: qsTr("2FA Confirmation")
+            visible: mfaCodeTextInput.visible
+        }
+        TextField {
+            id: mfaCodeTextInput
+            Layout.fillWidth: true
+            enabled: !session.running
+            visible: false
+            echoMode: TextInput.Password
+            placeholderText: "Confirmation code"
+            font.pointSize: AdjustedValues.f10
+        }
 
         Button {
             Layout.alignment: Qt.AlignLeft
@@ -85,7 +112,11 @@ Dialog {
         }
         Button {
             Layout.alignment: Qt.AlignRight
-            enabled: !(session.running || serviceTextInput.text.length == 0 || idTextInput.text.length == 0 || passwordTextInput.text.length == 0)
+            enabled: !(session.running ||
+                       serviceTextInput.text.length == 0 ||
+                       idTextInput.text.length == 0 ||
+                       passwordTextInput.text.length == 0 ||
+                       (mfaCodeTextInput.visible && mfaCodeTextInput.text.length === 0))
             font.pointSize: AdjustedValues.f10
             text: qsTr("Login")
             onClicked: session.create()

app/qml/parts/Author.qml

@@ -15,7 +15,7 @@ RowLayout {
 
     Label {
         id: displayNameText
-        Layout.fillWidth: true
+        Layout.maximumWidth: layoutWidth / 2
         Layout.alignment: Qt.AlignTop
         font.pointSize: AdjustedValues.f10
         elide: Text.ElideRight

app/qml/parts/PinnedIndicator.qml

@@ -0,0 +1,33 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls.Material 2.15
+import QtGraphicalEffects 1.15
+
+import tech.relog.hagoromo.singleton 1.0
+
+Rectangle {
+    color: Material.color(Material.Indigo)
+    radius: height / 2
+    RowLayout {
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.leftMargin: parent.height / 2 + 2
+        spacing: 2
+        Image {
+            Layout.preferredWidth: AdjustedValues.i12
+            Layout.preferredHeight: AdjustedValues.i12
+            layer.enabled: true
+            layer.effect: ColorOverlay {
+                color: "white"
+            }
+            source: "../images/pin.png"
+        }
+        Label {
+            Layout.topMargin: 3
+            text: qsTr("Pinned post")
+            font.pointSize: AdjustedValues.f8
+            color: "white"
+        }
+    }
+}

app/qml/parts/PostControls.qml

@@ -2,6 +2,8 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
+import QtGraphicalEffects 1.15
+
 import tech.relog.hagoromo.singleton 1.0
 
 import "../controls"
@@ -11,6 +13,7 @@ RowLayout {
 
     property bool isReposted: false
     property bool isLiked: false
+    property bool pinned: false
     property string postUri: ""
     property string handle: ""
     property bool mine: false
@@ -20,6 +23,7 @@ RowLayout {
     property alias repostMenuItem: repostMenuItem
     property alias quoteMenuItem: quoteMenuItem
     property alias likeButton: likeButton
+    property alias pinnedImage: pinnedImage
 
     signal triggeredTranslate()
     signal triggeredCopyToClipboard()
@@ -29,6 +33,7 @@ RowLayout {
     signal triggeredRequestViewLikedBy()
     signal triggeredRequestViewRepostedBy()
     signal triggeredRequestUpdateThreadGate()
+    signal triggeredRequestPin()
 
 
     function openInOhters(uri, handle){
@@ -87,6 +92,28 @@ RowLayout {
             visible: !parent.enabled
         }
     }
+    Item {
+        id: pinnedImage
+        Layout.preferredWidth: AdjustedValues.b24
+        Layout.preferredHeight: AdjustedValues.b24
+        Layout.leftMargin: 5
+        Layout.rightMargin: 5
+        Layout.alignment: Qt.AlignVCenter
+        Image {
+            width: AdjustedValues.i16
+            height: AdjustedValues.i16
+            anchors.centerIn: parent
+            source: pinned ? "../images/pin.png" : ""
+            layer.enabled: true
+            layer.effect: ColorOverlay {
+                color: Material.foreground
+            }
+        }
+        BusyIndicator {
+            anchors.fill: parent
+            visible: !parent.enabled
+        }
+    }
     Item {
         Layout.fillWidth: true
         height: 1
@@ -143,6 +170,11 @@ RowLayout {
                 onTriggered: triggeredRequestViewLikedBy()
             }
             MenuSeparator {}
+            MenuItem {
+                text: pinned ? qsTr("Unpin this post") : qsTr("Pin this post")
+                icon.source: "../images/pin.png"
+                onTriggered: triggeredRequestPin()
+            }
             MenuItem {
                 text: qsTr("Who can reply")
                 enabled: mine
@@ -200,6 +232,12 @@ RowLayout {
                 onTriggered: triggeredRequestViewLikedBy()
             }
             MenuSeparator {}
+            MenuItem {
+                text: pinned ? qsTr("Unpin this post") : qsTr("Pin this post")
+                icon.source: "../images/pin.png"
+                onTriggered: triggeredRequestPin()
+            }
+            MenuSeparator {}
             MenuItem {
                 text: qsTr("Report post")
                 icon.source: "../images/report.png"

app/qml/parts/PostDelegate.qml

@@ -26,6 +26,7 @@ ClickableFrame {
     property alias moderationFrame: moderationFrame
     property alias repostReactionAuthor: repostReactionAuthor
     property alias replyReactionAuthor: replyReactionAuthor
+    property alias pinnedIndicatorLabel: pinnedIndicatorLabel
     property alias postAvatarImage: postAvatarImage
     property alias postAuthor: postAuthor
     property alias recordText: recordText
@@ -81,6 +82,7 @@ ClickableFrame {
                 when: moderationFrame.showContent === false
                 PropertyChanges { target: repostReactionAuthor; visible: false }
                 PropertyChanges { target: replyReactionAuthor; visible: false }
+                PropertyChanges { target: pinnedIndicatorLabel; visible: false }
                 PropertyChanges { target: postLayout; visible: false }
             }
 
@@ -104,6 +106,11 @@ ClickableFrame {
             ]
         }
 
+        PinnedIndicator {
+            id: pinnedIndicatorLabel
+            Layout.fillWidth: true
+            Layout.preferredHeight: AdjustedValues.i12 * 1.2
+        }
         ReactionAuthor {
             id: repostReactionAuthor
             Layout.maximumWidth: postFrame.layoutWidth

app/qml/view/PostThreadView.qml

@@ -129,6 +129,7 @@ ColumnLayout {
                 replyReactionAuthor.visible: model.hasReply
                 replyReactionAuthor.displayName: model.replyParentDisplayName
                 replyReactionAuthor.handle: model.replyParentHandle
+                pinnedIndicatorLabel.visible: false
 
                 postAvatarImage.source: model.avatar
                 postAvatarImage.onClicked: requestViewProfile(model.did)
@@ -214,6 +215,7 @@ ColumnLayout {
                 postControls.onTriggeredTranslate: postThreadListModel.translate(model.cid)
                 postControls.isReposted: model.isReposted
                 postControls.isLiked: model.isLiked
+                postControls.pinned: model.pinnedByMe
                 postControls.postUri: model.uri
                 postControls.handle: model.handle
                 postControls.mine: model.did === postThreadView.accountDid
@@ -224,6 +226,7 @@ ColumnLayout {
                 postControls.onTriggeredRequestViewLikedBy: postThreadView.requestViewLikedBy(model.uri)
                 postControls.onTriggeredRequestViewRepostedBy: postThreadView.requestViewRepostedBy(model.uri)
                 postControls.onTriggeredRequestUpdateThreadGate: postThreadView.requestUpdateThreadGate(model.uri, model.threadGateUri, model.threadGateType, model.threadGateRules, updatedThreadGate)
+                postControls.onTriggeredRequestPin: rootListView.model.pin(model.index)
 
                 threadConnected: model.threadConnected
                 threadConnectorTop.visible:  model.threadConnectorTop

app/qml/view/ProfileView.qml

@@ -143,6 +143,11 @@ ColumnLayout {
 
     UserProfile {
         id: userProfile
+        onRunningChanged: {
+            if(running === false){
+                swipView.getLatest()
+            }
+        }
     }
 
     SystemTool {
@@ -236,6 +241,7 @@ ColumnLayout {
                 id: avatarImage
                 Layout.preferredWidth: AdjustedValues.i48
                 Layout.preferredHeight: AdjustedValues.i48
+                Layout.alignment: Qt.AlignTop
                 Layout.rowSpan: 2
                 source: userProfile.avatar
             }
@@ -290,6 +296,27 @@ ColumnLayout {
                 }
             }
         }
+        RowLayout {
+            Layout.leftMargin: 5
+            Layout.rightMargin: 5
+            visible: userProfile.serviceEndpoint.length > 0
+            spacing: 1
+            Image {
+                Layout.preferredWidth: AdjustedValues.i12
+                Layout.preferredHeight: AdjustedValues.i12
+                source: "../images/database.png"
+                layer.enabled: true
+                layer.effect: ColorOverlay {
+                    color: Material.color(Material.Grey)
+                }
+            }
+            Label {
+                Layout.topMargin: 2
+                font.pointSize: AdjustedValues.f8
+                color: Material.color(Material.Grey)
+                text: userProfile.serviceEndpoint
+            }
+        }
         TagLabelLayout {
             id: belongingListsLayout
             Layout.preferredWidth: profileView.width - 10
@@ -477,13 +504,17 @@ ColumnLayout {
         currentIndex: tabBar.currentIndex
         interactive: false
 
-        onCurrentItemChanged: {
+        onCurrentItemChanged: getLatest()
+
+        function getLatest() {
             if(currentItem == null)
                 return
             if(currentItem.model === undefined)
                 return
             if(currentItem.model.rowCount() > 0)
                 return
+            if(userProfile.handle.length === 0)
+                return
             currentItem.model.getLatest()
         }
 
@@ -495,7 +526,13 @@ ColumnLayout {
                 displayInterval: 0
                 authorDid: profileView.userDid
                 filter: AuthorFeedListModel.PostsWithReplies
+                pinnedPost: userProfile.pinnedPost
+                displayPinnedPost: true
 
+                onUpdatePin: (uri) => {
+                                 userProfile.pinnedPost = uri
+                                 getLatest()
+                             }
                 onErrorOccured: (code, message) => profileView.errorOccured(code, message)
             }
             accountDid: profileView.accountDid