fixed user profile display on smaller screens and added link to ROOT CA

This commit is contained in:
Morgan McMillian 2016-10-21 21:16:40 -07:00
parent 80ad29bef0
commit 10fe97ef90
4 changed files with 130 additions and 113 deletions

View file

@ -31,6 +31,14 @@ Sheet {
} }
horizontalAlignment: HorizontalAlignment.Center horizontalAlignment: HorizontalAlignment.Center
} }
Container {
}
Label {
text: "<a href=\"https://zoidberg.monkeystew.net/tmp/X3.cer\">DST Root CA X3</a>"
textFormat: TextFormat.Html
horizontalAlignment: HorizontalAlignment.Center
}
} }
} }
} }

View file

@ -5,6 +5,7 @@ Page {
property variant user property variant user
property variant theme : Application.themeSupport.theme.colorTheme.style 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 follow(string uid)
signal unfollow(string uid) signal unfollow(string uid)
@ -13,137 +14,145 @@ Page {
signal mute(string uid) signal mute(string uid)
signal unmute(string uid) signal unmute(string uid)
Container { ScrollView {
Container { Container {
layout: DockLayout {}
horizontalAlignment: HorizontalAlignment.Fill
preferredHeight: cover.height
Container { Container {
layout: DockLayout {}
horizontalAlignment: HorizontalAlignment.Fill
preferredHeight: cover.height
Container { Container {
opacity: 0.5 Container {
WebImageView { opacity: 0.6
id: cover WebImageView {
preferredWidth: 1440 id: cover
scalingMethod: ScalingMethod.AspectFit preferredWidth: 1440
//imageSource: "asset:///icons/default_cover.png" maxHeight: ui.du(24)
url: user.content.cover_image.link 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 { Container {
layout: StackLayout {
orientation: LayoutOrientation.LeftToRight
}
topPadding: ui.sdu(3) topPadding: ui.sdu(3)
leftPadding: ui.sdu(3) leftPadding: ui.sdu(3)
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 {
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) rightPadding: ui.sdu(3)
layout: DockLayout {}
horizontalAlignment: HorizontalAlignment.Fill
Container { Container {
layout: StackLayout { preferredWidth: ui.du(45)
orientation: LayoutOrientation.LeftToRight
}
horizontalAlignment: HorizontalAlignment.Right
Label { Label {
text: qsTr("Following") //text: lorem
text: user.content.html
} multiline: true
Label { textFormat: TextFormat.Html
text: user.counts.following
} }
} }
Container { Container {
layout: StackLayout {
orientation: LayoutOrientation.LeftToRight
}
horizontalAlignment: HorizontalAlignment.Right horizontalAlignment: HorizontalAlignment.Right
Label { rightPadding: ui.sdu(3)
text: qsTr("Followers") Container {
id: counts
layout: StackLayout {
orientation: LayoutOrientation.LeftToRight
}
horizontalAlignment: HorizontalAlignment.Right
Label {
text: qsTr("Following")
}
Label {
text: user.counts.following
}
} }
Label { Container {
text: user.counts.followers 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
}
} }
} }
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: [ actions: [

View file

@ -1 +1 @@
168 179

View file

@ -68,52 +68,52 @@
<context> <context>
<name>ProfilePage</name> <name>ProfilePage</name>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="97"/> <location filename="../assets/ProfilePage.qml" line="105"/>
<source>Following</source> <source>Following</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="110"/> <location filename="../assets/ProfilePage.qml" line="118"/>
<source>Followers</source> <source>Followers</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="123"/> <location filename="../assets/ProfilePage.qml" line="131"/>
<source>Posts</source> <source>Posts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="136"/> <location filename="../assets/ProfilePage.qml" line="144"/>
<source>Bookmarks</source> <source>Bookmarks</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="151"/> <location filename="../assets/ProfilePage.qml" line="160"/>
<source>Unfollow</source> <source>Unfollow</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="151"/> <location filename="../assets/ProfilePage.qml" line="160"/>
<source>Follow</source> <source>Follow</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="164"/> <location filename="../assets/ProfilePage.qml" line="173"/>
<source>Unmute</source> <source>Unmute</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="164"/> <location filename="../assets/ProfilePage.qml" line="173"/>
<source>Mute</source> <source>Mute</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="177"/> <location filename="../assets/ProfilePage.qml" line="186"/>
<source>Unblock</source> <source>Unblock</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../assets/ProfilePage.qml" line="177"/> <location filename="../assets/ProfilePage.qml" line="186"/>
<source>Block</source> <source>Block</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>