chris/harbour-sailfin
chris/harbour-sailfin
1
0
Fork 0
mirror of https://github.com/HenkKalkwater/harbour-sailfin.git synced 2025-09-04 01:42:44 +00:00
Code Issues Releases Wiki Activity

Add UserLoader back + misc regression fixes

Browse source
This commit is contained in:
Chris Josten 2021-08-18 00:04:27 +02:00
parent bb1e3ea21d
commit e04ec364c1
15 changed files with 406 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sailfish/qml/pages/SettingsPage.qml
View file

@ -28,6 +28,8 @@ Page {
id: settingsPage
allowedOrientations: Orientation.All
property alias loggedInUser: userLoader.data
SilicaFlickable {
anchors.fill: parent
contentHeight: content.height
@ -58,9 +60,10 @@ Page {
rightMargin: Theme.horizontalPageMargin
}
height: user.implicitHeight + server.implicitHeight + Theme.paddingMedium
QtObject {
id: loggedInUser
//apiClient: ApiClient
J.UserLoader{
id: userLoader
apiClient: appWindow.apiClient
userId: appWindow.apiClient.userId
}
RemoteImage {
id: userIcon
@ -81,7 +84,7 @@ Page {
bottom: parent.verticalCenter
right: parent.right
}
text: loggedInUser.status == User.Ready ? loggedInUser.name : apiClient.userId
text: userLoader.status === J.UserLoader.Ready ? loggedInUser.name : apiClient.userId
color: Theme.highlightColor
}