medvedych/harbour-tooter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sync with upstream branch

Browse source
This commit is contained in:
molan-git 2020-05-04 10:29:05 +02:00 committed by GitHub
parent aa24e1646d
commit 4a0cf8b080
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qml/pages/Conversation.qml
View file

@ -1,13 +1,13 @@
import QtQuick 2.0 import QtQuick 2.0
import Sailfish.Silica 1.0 import Sailfish.Silica 1.0
import harbour.tooterb.Uploader 1.0 import harbour.tooter.Uploader 1.0
import "../lib/API.js" as Logic import "../lib/API.js" as Logic
import "./components/" import "./components/"
Page { Page {
id: conversationPage id: conversationPage
property string type property string type
property alias title: header.title property alias title: header.title
property alias description: header.description property alias description: header.description
property alias avatar: header.image property alias avatar: header.image
property string suggestedUser: "" property string suggestedUser: ""
@ -61,10 +61,10 @@ Page {
} }
SilicaListView { SilicaListView {
id: conversationList id: conversationList
header: PageHeader { header: PageHeader {
title: qsTr("Conversation") title: qsTr("Conversation")
} }
clip: true clip: true
anchors { anchors {
top: parent.top top: parent.top
bottom: panel.top bottom: panel.top
@ -157,6 +157,7 @@ Page {
Rectangle { Rectangle {
id: progressBar id: progressBar
width: toot.text.length ? panel.width * (toot.text.length / tootMaxChar) : 0 width: toot.text.length ? panel.width * (toot.text.length / tootMaxChar) : 0
height: Theme.itemSizeSmall * 0.05 height: Theme.itemSizeSmall * 0.05
color: Theme.highlightBackgroundColor color: Theme.highlightBackgroundColor
opacity: 0.7 opacity: 0.7
@ -208,9 +209,9 @@ Page {
0) == '#') ? description + ' ' : '' 0) == '#') ? description + ' ' : ''
height: Math.max(270, Math.min(900, implicitHeight)) height: Math.max(270, Math.min(900, implicitHeight))
//height: implicitHeight //height: implicitHeight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
placeholderText: qsTr("What's on your mind?") placeholderText: qsTr("What's on your mind?")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
EnterKey.onClicked: { EnterKey.onClicked: {
//tweet() //tweet()
} }
@ -606,7 +607,7 @@ Page {
Label { Label {
anchors.centerIn: parent anchors.centerIn: parent
color: (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor) color: (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor)
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeLarge
text: glyph text: glyph
} }
onClicked: { onClicked: {