diff --git a/assets/LoginSheet.qml b/assets/LoginSheet.qml index 17479b5..0f97007 100644 --- a/assets/LoginSheet.qml +++ b/assets/LoginSheet.qml @@ -31,6 +31,14 @@ Sheet { } horizontalAlignment: HorizontalAlignment.Center } + Container { + + } + Label { + text: "DST Root CA X3" + textFormat: TextFormat.Html + horizontalAlignment: HorizontalAlignment.Center + } } } } diff --git a/assets/ProfilePage.qml b/assets/ProfilePage.qml index f42b369..606fbd6 100644 --- a/assets/ProfilePage.qml +++ b/assets/ProfilePage.qml @@ -5,6 +5,7 @@ Page { property variant user property variant theme : Application.themeSupport.theme.colorTheme.style + property string lorem: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse non enim tellus. Donec vestibulum enim urna, eget faucibus diam commodo a. Donec eget hendrerit metus. Pellentesque vehicula nisi nec vehicula ullamcorper. Aliquam a elit eget mi fringilla porta fermentum eget eros. Phasellus vestibulum nulla sed elit congue adipiscing. Cras imperdiet urna ac ipsum volutpat lobortis. Maecenas vehicula tortor at viverra convallis. Curabitur nibh massa, tristique id felis ut, venenatis faucibus dui. Donec fringilla, mi nec tincidunt dignissim, neque nunc semper mi, quis rutrum diam turpis sit amet erat. Cras a sodales nisi. Nunc sit amet diam sed lectus molestie cursus convallis et erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Duis vitae varius leo. Mauris eu leo a nunc bibendum rutrum euismod et ipsum. " signal follow(string uid) signal unfollow(string uid) @@ -13,137 +14,145 @@ Page { signal mute(string uid) signal unmute(string uid) - Container { + ScrollView { Container { - layout: DockLayout {} - horizontalAlignment: HorizontalAlignment.Fill - preferredHeight: cover.height Container { + layout: DockLayout {} + horizontalAlignment: HorizontalAlignment.Fill + preferredHeight: cover.height Container { - opacity: 0.5 - WebImageView { - id: cover - preferredWidth: 1440 - scalingMethod: ScalingMethod.AspectFit - //imageSource: "asset:///icons/default_cover.png" - url: user.content.cover_image.link + Container { + opacity: 0.6 + WebImageView { + id: cover + preferredWidth: 1440 + maxHeight: ui.du(24) + scalingMethod: ScalingMethod.AspectFill + //imageSource: "asset:///icons/default_cover.png" + url: user.content.cover_image.link + } } } + Container { + layout: StackLayout { + orientation: LayoutOrientation.LeftToRight + } + topPadding: ui.sdu(3) + leftPadding: ui.sdu(3) + verticalAlignment: VerticalAlignment.Center + Container { + background: (theme === VisualStyle.Bright) ? Color.create("#e9e9e9") : Color.create("#282828") + WebImageView { + //imageSource: "asset:///icons/laughing_man.png" + url: user.content.avatar_image.link + maxHeight: ui.du(14) + maxWidth: ui.du(14) + } + } + Container { + leftPadding: ui.sdu(3) + rightPadding: ui.sdu(3) + horizontalAlignment: HorizontalAlignment.Fill + //background: (theme === VisualStyle.Bright) ? Color.create("#e9e9e9") : Color.create("#282828") + Container { + Label { + //text: "Morgan McMillian" + text: user.name + textStyle.fontWeight: FontWeight.Bold + textStyle.fontSize: FontSize.Large + + } + } + Container { + Label { + //text: "thrrgilag" + text: user.username + textStyle.fontSize: FontSize.Medium + + } + + } + } + + } + } Container { - layout: StackLayout { - orientation: LayoutOrientation.LeftToRight - } topPadding: ui.sdu(3) leftPadding: ui.sdu(3) + rightPadding: ui.sdu(3) + layout: DockLayout {} + horizontalAlignment: HorizontalAlignment.Fill Container { - background: (theme === VisualStyle.Bright) ? Color.create("#e9e9e9") : Color.create("#282828") - WebImageView { - //imageSource: "asset:///icons/laughing_man.png" - url: user.content.avatar_image.link - maxHeight: ui.du(14) - maxWidth: ui.du(14) + preferredWidth: ui.du(45) + Label { + //text: lorem + text: user.content.html + multiline: true + textFormat: TextFormat.Html } } Container { - leftPadding: ui.sdu(3) + horizontalAlignment: HorizontalAlignment.Right rightPadding: ui.sdu(3) - horizontalAlignment: HorizontalAlignment.Fill - //background: (theme === VisualStyle.Bright) ? Color.create("#e9e9e9") : Color.create("#282828") Container { + id: counts + layout: StackLayout { + orientation: LayoutOrientation.LeftToRight + } + horizontalAlignment: HorizontalAlignment.Right Label { - //text: "Morgan McMillian" - text: user.name - textStyle.fontWeight: FontWeight.Bold - textStyle.fontSize: FontSize.Large + text: qsTr("Following") } + Label { + text: user.counts.following + } } Container { + layout: StackLayout { + orientation: LayoutOrientation.LeftToRight + } + horizontalAlignment: HorizontalAlignment.Right Label { - //text: "thrrgilag" - text: user.username - textStyle.fontSize: FontSize.Medium + text: qsTr("Followers") } - + Label { + text: user.counts.followers + } + } + Container { + layout: StackLayout { + orientation: LayoutOrientation.LeftToRight + } + horizontalAlignment: HorizontalAlignment.Right + Label { + text: qsTr("Posts") + + } + Label { + text: user.counts.posts + } + } + Container { + layout: StackLayout { + orientation: LayoutOrientation.LeftToRight + } + horizontalAlignment: HorizontalAlignment.Right + Label { + text: qsTr("Bookmarks") + + } + Label { + text: user.counts.bookmarks + } } } } } - Container { - topPadding: ui.sdu(3) - leftPadding: ui.sdu(3) - layout: DockLayout {} - horizontalAlignment: HorizontalAlignment.Fill - Container { - Label { - //text: "Bio goes here." - text: user.content.text - multiline: true - } - } - Container { - horizontalAlignment: HorizontalAlignment.Right - rightPadding: ui.sdu(3) - Container { - layout: StackLayout { - orientation: LayoutOrientation.LeftToRight - } - horizontalAlignment: HorizontalAlignment.Right - Label { - text: qsTr("Following") - - } - Label { - text: user.counts.following - } - } - Container { - layout: StackLayout { - orientation: LayoutOrientation.LeftToRight - } - horizontalAlignment: HorizontalAlignment.Right - Label { - text: qsTr("Followers") - - } - Label { - text: user.counts.followers - } - } - Container { - layout: StackLayout { - orientation: LayoutOrientation.LeftToRight - } - horizontalAlignment: HorizontalAlignment.Right - Label { - text: qsTr("Posts") - - } - Label { - text: user.counts.posts - } - } - Container { - layout: StackLayout { - orientation: LayoutOrientation.LeftToRight - } - horizontalAlignment: HorizontalAlignment.Right - Label { - text: qsTr("Bookmarks") - - } - Label { - text: user.counts.bookmarks - } - } - } - - } - } actions: [ diff --git a/buildnum b/buildnum index a3090d2..cde50ca 100644 --- a/buildnum +++ b/buildnum @@ -1 +1 @@ -168 \ No newline at end of file +179 \ No newline at end of file diff --git a/translations/Goober.ts b/translations/Goober.ts index 95485ec..45fdd2c 100644 --- a/translations/Goober.ts +++ b/translations/Goober.ts @@ -68,52 +68,52 @@ ProfilePage - + Following - + Followers - + Posts - + Bookmarks - + Unfollow - + Follow - + Unmute - + Mute - + Unblock - + Block