From eb14c94dc835060823ae784334e37267293b9e0e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:07:10 +0200 Subject: [PATCH 01/12] Fix empty profil title If no display name is provided, use user account name. --- qml/pages/components/ProfileHeader.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index 54b9874..d7c087d 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -54,7 +54,11 @@ Item { } Label { id: ttl - text: title + text: + if (title === "") { + description.split('@')[0] + } + else title height: contentHeight color: Theme.primaryColor font.pixelSize: Theme.fontSizeLarge From f492be89f1a8b3991b4b98ddde888e8b376940f9 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:10:35 +0200 Subject: [PATCH 02/12] Update Conversation.qml Adjusted font-size for user input (toots) --- qml/pages/Conversation.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index fce4817..5da692c 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -209,8 +209,9 @@ Page { 0) == '#') ? description + ' ' : '' height: Math.max(270, Math.min(900, implicitHeight)) //height: implicitHeight - horizontalAlignment: Text.AlignLeft + horizontalAlignment: Text.AlignLeft placeholderText: qsTr("What's on your mind?") + font.pixelSize: Theme.fontSizeSmall EnterKey.onClicked: { //tweet() } From 231c4d6e199d71f96e7d1b8b79134608dd52b13e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:14:10 +0200 Subject: [PATCH 03/12] Fix empty profil title If no display name is provided, use user account name (in ProfileHeader.qml) --- qml/pages/Profile.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index d7b8e42..6d56f44 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -141,7 +141,7 @@ Page { header: ProfileHeader { id: header title: display_name - description: '@'+username + description: username image: profileImage } From 4a03433ccbd37c56eca341e6c67b18cbac375507 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:15:34 +0200 Subject: [PATCH 04/12] Update ProfileHeader.qml --- qml/pages/components/ProfileHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index d7c087d..72208f7 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -56,7 +56,7 @@ Item { id: ttl text: if (title === "") { - description.split('@')[0] + description.split('')[0] } else title height: contentHeight From a51acf949969b0a58d8f3cc3ac85dcfeee53151e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:16:04 +0200 Subject: [PATCH 05/12] Fix empty profile title If no display name is provided, use user account name. --- qml/pages/components/ProfileHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index 72208f7..d7c087d 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -56,7 +56,7 @@ Item { id: ttl text: if (title === "") { - description.split('')[0] + description.split('@')[0] } else title height: contentHeight From 97fc84f0c7378dcc138caf05ffaa42145a57bbeb Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:16:43 +0200 Subject: [PATCH 06/12] Update Profile.qml --- qml/pages/Profile.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index 6d56f44..1bd5976 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -141,7 +141,7 @@ Page { header: ProfileHeader { id: header title: display_name - description: username + description: username image: profileImage } From ac26d6772bbf6a4c6093ea2cf222c065752c3b04 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:17:10 +0200 Subject: [PATCH 07/12] Fix empty profile title If no display name is provided, use user account name. --- qml/pages/Profile.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index 1bd5976..6d56f44 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -141,7 +141,7 @@ Page { header: ProfileHeader { id: header title: display_name - description: username + description: username image: profileImage } From ba39f51a5e63cb750b609f6552ad545e3ada52e5 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:20:09 +0200 Subject: [PATCH 08/12] Fix empty display/user name If no display_name is profided, use username (without @instance) --- qml/pages/components/MiniHeader.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qml/pages/components/MiniHeader.qml b/qml/pages/components/MiniHeader.qml index 34140a9..6a9f6f9 100644 --- a/qml/pages/components/MiniHeader.qml +++ b/qml/pages/components/MiniHeader.qml @@ -12,7 +12,11 @@ Item { left: parent.left leftMargin: Theme.paddingMedium } - text: account_display_name + text: + if (account_display_name === "") { + account_username.split('@')[0] + } + else account_display_name width: contentWidth > parent.width /2 ? parent.width /2 : contentWidth truncationMode: TruncationMode.Fade font.weight: Font.Bold From 4832ab50f47f6dc10e0b49958bfff09fd9bed2cb Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 10:24:30 +0200 Subject: [PATCH 09/12] Fix empty profile title If no display name is provided, use user account name. --- qml/pages/components/ProfileHeader.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index d7c087d..ac76884 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -60,7 +60,7 @@ Item { } else title height: contentHeight - color: Theme.primaryColor + color: Theme.highlightColor font.pixelSize: Theme.fontSizeLarge font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight @@ -70,7 +70,7 @@ Item { Label { height: description === "" ? 0 : contentHeight text: description - color: Theme.secondaryColor + color: Theme.secondaryHighlightColor font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight From 8f87b85026e36997bd875a267bdeac41c30b2cb3 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 4 May 2020 11:48:29 +0200 Subject: [PATCH 10/12] Icon alignment fixes --- qml/pages/Conversation.qml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 5da692c..3de2497 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -209,9 +209,9 @@ Page { 0) == '#') ? description + ' ' : '' height: Math.max(270, Math.min(900, implicitHeight)) //height: implicitHeight - horizontalAlignment: Text.AlignLeft + horizontalAlignment: Text.AlignLeft placeholderText: qsTr("What's on your mind?") - font.pixelSize: Theme.fontSizeSmall + font.pixelSize: Theme.fontSizeSmall EnterKey.onClicked: { //tweet() } @@ -306,7 +306,8 @@ Page { id: btnContentWarning anchors { - verticalCenter: privacy.verticalCenter + top: toot.bottom + topMargin: -Theme.paddingSmall * 1.5 left: parent.left leftMargin: Theme.paddingMedium } @@ -318,7 +319,8 @@ Page { id: btnAddImage enabled: mediaModel.count < 4 anchors { - verticalCenter: privacy.verticalCenter + top: toot.bottom + topMargin: -Theme.paddingSmall * 1.5 left: btnContentWarning.right leftMargin: Theme.paddingSmall } @@ -364,7 +366,7 @@ Page { id: privacy anchors { top: toot.bottom - topMargin: -Theme.paddingSmall * 2 + topMargin: -Theme.paddingSmall * 1.5 left: btnAddImage.right right: btnSend.left } @@ -390,6 +392,7 @@ Page { + (pressed ? Theme.highlightColor : Theme.primaryColor) anchors { top: toot.bottom + topMargin: -Theme.paddingSmall * 2 right: parent.right rightMargin: Theme.paddingSmall } From 7b0ff5f760da04397dc077c2169cfb5ae3bd62b6 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 4 May 2020 14:55:52 +0200 Subject: [PATCH 11/12] Fix anchors text toot --- qml/pages/Conversation.qml | 8 ++++---- translations/harbour-tooter-it.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 3de2497..1f02857 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -157,7 +157,6 @@ Page { Rectangle { id: progressBar width: toot.text.length ? panel.width * (toot.text.length / tootMaxChar) : 0 - height: Theme.itemSizeSmall * 0.05 color: Theme.highlightBackgroundColor opacity: 0.7 @@ -179,6 +178,7 @@ Page { } autoScrollEnabled: true labelVisible: false + font.pixelSize: Theme.fontSizeSmall placeholderText: qsTr("Write your warning here") placeholderColor: palette.highlightColor color: palette.highlightColor @@ -198,8 +198,8 @@ Page { top: warningContent.bottom topMargin: Theme.paddingMedium left: parent.left - right: parent.right - rightMargin: Theme.paddingMedium + right: parent.right + rightMargin: Theme.paddingLarge * 2 } autoScrollEnabled: true labelVisible: false @@ -392,7 +392,7 @@ Page { + (pressed ? Theme.highlightColor : Theme.primaryColor) anchors { top: toot.bottom - topMargin: -Theme.paddingSmall * 2 + topMargin: -Theme.paddingSmall * 1.5 right: parent.right rightMargin: Theme.paddingSmall } diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 7f50712..5df1b51 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -43,37 +43,37 @@ A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Emojis Emojis - + Tap to insert Tap per inserire From 4cdb2f1540f92fc333fc95da4778d42e00e91065 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 4 May 2020 15:32:01 +0200 Subject: [PATCH 12/12] Update Conversation.qml --- qml/pages/Conversation.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 1f02857..3fed799 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -243,6 +243,7 @@ Page { right: parent.right rightMargin: Theme.paddingSmall } + opacity: 0.8 icon.source: "../../qml/images/emojiselect.svg" + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) onClicked: pageStack.push(firstWizardPage) }