diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index 751c57b..770124c 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -99,18 +99,22 @@ CoverBackground { color: Theme.primaryColor } + signal activateapp(string person, string notice) CoverActionList { id: coverAction - - CoverAction { + /*CoverAction { iconSource: "image://theme/icon-cover-next" onTriggered: { Logic.conf.notificationLastID = 0; } - } + }*/ CoverAction { - iconSource: "image://theme/icon-cover-pause" + iconSource: "image://theme/icon-cover-new" + onTriggered: { + pageStack.push(Qt.resolvedUrl("./../pages/Conversation.qml"), {}) + appWindow.activate(); + } } } function checkNotifications(){ diff --git a/qml/harbour-tooter.qml b/qml/harbour-tooter.qml index 34512cf..bdfb464 100644 --- a/qml/harbour-tooter.qml +++ b/qml/harbour-tooter.qml @@ -31,11 +31,11 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import "pages" -import org.nemomobile.notifications 1.0 import "./lib/API.js" as Logic ApplicationWindow { + id: appWindow //initialPage: Component { FirstPage { } } cover: Qt.resolvedUrl("cover/CoverPage.qml") allowedOrientations: defaultAllowedOrientations @@ -53,7 +53,14 @@ ApplicationWindow if (Logic.conf['login']) { //Logic.conf['notificationLastID'] = 0 Logic.api.setConfig("api_user_token", Logic.conf['api_user_token']) - pageStack.push(Qt.resolvedUrl("./pages/MainPage.qml"), {}) + //accounts/verify_credentials + Logic.api.get('instance', [], function(data) { + console.log(JSON.stringify(data)) + pageStack.push(Qt.resolvedUrl("./pages/MainPage.qml"), {}) + }); + + // + // //pageStack.push(Qt.resolvedUrl("./pages/Conversation.qml"), {}) } else { pageStack.push(Qt.resolvedUrl("./pages/LoginPage.qml"), {}) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 531a421..650fb82 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -12,7 +12,7 @@ Page { property alias avatar: header.image property string suggestedUser: "" property ListModel suggestedModel; - property int toot_id + property string toot_id: "" property ListModel mdl; allowedOrientations: Orientation.All onSuggestedUserChanged: { @@ -348,8 +348,8 @@ Page { }, 'conf' : Logic.conf }; - if (toot_id > 0) - msg.params['in_reply_to_id'] = toot_id + if (toot_id) + msg.params['in_reply_to_id'] = (toot_id)+"" if (warningContent.visible && warningContent.text.length > 0){ msg.params['sensitive'] = 1 diff --git a/rpm/harbour-tooter.changes.in b/rpm/harbour-tooter.changes.in index d4e415f..fdacc6b 100644 --- a/rpm/harbour-tooter.changes.in +++ b/rpm/harbour-tooter.changes.in @@ -18,7 +18,7 @@ * Tue July 4 2017 Dusko Angirevic 0.1.7-0 - Added spoiler support for toots -- Press and hold for boost and favorite option +- Press and hold for boost and favourite option - Updated harbour-tooter-es.ts by Caballlero - Unable to connect to unixcorn.xyz [#12] [bugfix] @@ -37,7 +37,7 @@ - ES lang update by Caballlero * Thu October 10 2017 Dusko Angirevic 0.2.1-0 -- Added bugs for later (merging branches and cotributions) +- Added bugs for later (merging branches and contributions) * Thu October 19 2017 Dusko Angirevic 0.2.2-0 - Updated translations @@ -49,5 +49,6 @@ - Added User autocomplete options - Added video player options - Smileys are inserted on the cursor position -- Pintch to zoom photos +- Pinch to zoom photos - Support for downloading media to the device +- Added cover action for new toot