From 5f4dae2a2ddd42aca31cd4ae05d8096e8a08f1ca Mon Sep 17 00:00:00 2001 From: molan-git Date: Fri, 5 Jun 2020 18:38:15 +0200 Subject: [PATCH] added icon-s-following - added custom follower icon for miniHeader - theme coloring for miniHeader icons - removed unused icons - changed icon name emojis --- harbour-tooter.pro | 6 +-- qml/images/boosted.svg | 16 -------- .../{emojiselect.svg => icon-m-emoji.svg} | 0 qml/images/icon-s-following.svg | 12 ++++++ qml/images/notification.svg | 39 ------------------- qml/images/verified.svg | 26 ------------- qml/lib/Worker.js | 2 +- qml/pages/ConversationPage.qml | 2 +- qml/pages/MainPage.qml | 2 +- qml/pages/components/MiniHeader.qml | 4 +- qml/pages/components/MiniStatus.qml | 3 +- qml/pages/components/MyList.qml | 29 +++++++------- 12 files changed, 37 insertions(+), 104 deletions(-) delete mode 100644 qml/images/boosted.svg rename qml/images/{emojiselect.svg => icon-m-emoji.svg} (100%) create mode 100644 qml/images/icon-s-following.svg delete mode 100644 qml/images/notification.svg delete mode 100644 qml/images/verified.svg diff --git a/harbour-tooter.pro b/harbour-tooter.pro index a7c61ae..fc04db3 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -74,11 +74,9 @@ DISTFILES += qml/harbour-tooter.qml \ qml/pages/components/Toot.qml \ qml/pages/Browser.qml \ qml/lib/API.js \ - qml/images/notification.svg \ - qml/images/verified.svg \ - qml/images/boosted.svg \ + qml/images/icon-s-following \ qml/images/tooter.svg \ - qml/images/emojiselect.svg \ + qml/images/icon-m-emoji.svg \ qml/images/icon-m-profile.svg \ qml/images/icon-l-profile.svg \ qml/lib/Mastodon.js \ diff --git a/qml/images/boosted.svg b/qml/images/boosted.svg deleted file mode 100644 index 468e2da..0000000 --- a/qml/images/boosted.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - diff --git a/qml/images/emojiselect.svg b/qml/images/icon-m-emoji.svg similarity index 100% rename from qml/images/emojiselect.svg rename to qml/images/icon-m-emoji.svg diff --git a/qml/images/icon-s-following.svg b/qml/images/icon-s-following.svg new file mode 100644 index 0000000..ebcf5ee --- /dev/null +++ b/qml/images/icon-s-following.svg @@ -0,0 +1,12 @@ + + Artboard 1 + + + + + + + + + + diff --git a/qml/images/notification.svg b/qml/images/notification.svg deleted file mode 100644 index 56f1b35..0000000 --- a/qml/images/notification.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qml/images/verified.svg b/qml/images/verified.svg deleted file mode 100644 index 65d529b..0000000 --- a/qml/images/verified.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index 19469c6..0317523 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -190,7 +190,7 @@ function parseNotification(data){ item = parseAccounts(item, "", data["account"]) item = parseAccounts(item, "reblog_", data["account"]) item['content'] = data['account']['note'] - item['typeIcon'] = "image://theme/icon-s-installed" + item['typeIcon'] = "../../images/icon-s-following.svg" item['attachments'] = [] break; diff --git a/qml/pages/ConversationPage.qml b/qml/pages/ConversationPage.qml index db97654..fb57082 100644 --- a/qml/pages/ConversationPage.qml +++ b/qml/pages/ConversationPage.qml @@ -262,7 +262,7 @@ Page { color: Theme.secondaryColor width: Theme.iconSizeSmallPlus fillMode: Image.PreserveAspectFit - source: "../../qml/images/emojiselect.svg" + source: "../../qml/images/icon-m-emoji.svg" } anchors { top: warningContent.bottom diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index acd1a89..c809e19 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -208,7 +208,7 @@ Page { } IconButton { - id: newTweet + id: newToot width: Theme.iconSizeLarge height: width visible: !isPortrait ? true : !infoPanel.open diff --git a/qml/pages/components/MiniHeader.qml b/qml/pages/components/MiniHeader.qml index af5c608..0b52e44 100644 --- a/qml/pages/components/MiniHeader.qml +++ b/qml/pages/components/MiniHeader.qml @@ -26,7 +26,7 @@ Item { } Image { - id: iconVerified + id: iconLocked y: Theme.paddingLarge anchors { left: lblName.right @@ -47,7 +47,7 @@ Item { font.pixelSize: Theme.fontSizeExtraSmall color: (pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor) anchors { - left: iconVerified.right + left: iconLocked.right right: lblDate.left leftMargin: Theme.paddingMedium baseline: lblName.baseline diff --git a/qml/pages/components/MiniStatus.qml b/qml/pages/components/MiniStatus.qml index a38dfca..d9dc96c 100644 --- a/qml/pages/components/MiniStatus.qml +++ b/qml/pages/components/MiniStatus.qml @@ -7,9 +7,10 @@ Item { visible: true height: icon.height+Theme.paddingMedium width: parent.width - Image { + Icon { id: icon visible: type.length + color: Theme.highlightColor width: Theme.iconSizeExtraSmall height: width source: typeof typeIcon !== "undefined" ? typeIcon : "" diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index e3b1d14..ce8f5e6 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -39,17 +39,18 @@ SilicaListView { console.log("LIST send signal emitted with notice: " + notice) } - BusyIndicator { - size: BusyIndicatorSize.Large - running: myList.model.count === 0 && !viewPlaceHolder.visible - anchors.centerIn: parent - } header: PageHeader { title: myList.title description: myList.description } + BusyIndicator { + size: BusyIndicatorSize.Large + running: myList.model.count === 0 && !viewPlaceHolder.visible + anchors.centerIn: parent + } + ViewPlaceholder { id: viewPlaceHolder enabled: model.count === 0 @@ -65,6 +66,16 @@ SilicaListView { } } + MenuItem { + text: qsTr("New Toot") + onClicked: { + pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), { + //headerTitle: "New Toot", + type: "new" + }) + } + } + MenuItem { text: qsTr("Load more") onClicked: { @@ -72,14 +83,6 @@ SilicaListView { } } } - clip: true - section { - property: 'section' - delegate: SectionHeader { - height: Theme.itemSizeExtraSmall - text: Format.formatDate(section, Formatter.DateMedium) - } - } delegate: VisualContainer { } //Toot {}