ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DevicesPage and AccountsPage on mobile

Browse Source 
Also make the padding smaller
This commit is contained in:
Tobias Fella
2021-09-07 11:48:46 +02:00
parent 8118068fb5
commit 821993c443
3 changed files with 127 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
imports/NeoChat/Page/AccountsPage.qml
View File

@@ -14,10 +14,10 @@ import NeoChat.Dialog 1.0
Kirigami.Page { Kirigami.Page {
title: i18n("Accounts") title: i18n("Accounts")
leftPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
topPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
rightPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
actions.main: Kirigami.Action { actions.main: Kirigami.Action {
text: i18n("Add an account") text: i18n("Add an account")
@@ -26,9 +26,6 @@ Kirigami.Page {
visible: !pageSettingStack.wideMode visible: !pageSettingStack.wideMode
} }
ColumnLayout {
anchors.fill: parent
Connections { Connections {
target: pageSettingStack target: pageSettingStack
onWideModeChanged: scroll.background.visible = pageSettingStack.wideMode onWideModeChanged: scroll.background.visible = pageSettingStack.wideMode
@@ -38,8 +35,7 @@ Kirigami.Page {
id: scroll id: scroll
Component.onCompleted: background.visible = pageSettingStack.wideMode Component.onCompleted: background.visible = pageSettingStack.wideMode
Layout.fillWidth: true anchors.fill: parent
Layout.fillHeight: true
Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
ListView { ListView {
@@ -84,20 +80,27 @@ Kirigami.Page {
} }
} }
footer: Column {
RowLayout { height: visible ? implicitHeight : 0
Item { Kirigami.ActionToolBar {
Layout.fillWidth: true alignment: Qt.AlignRight
}
Controls.Button {
visible: pageSettingStack.wideMode visible: pageSettingStack.wideMode
rightPadding: Kirigami.Units.smallSpacing
width: parent.width
flat: false
actions: [
Kirigami.Action {
text: i18n("Add an account") text: i18n("Add an account")
icon.name: "list-add-user" icon.name: "list-add-user"
onClicked: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml") onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
}
]
}
Item {
width: parent.width
height: Kirigami.Units.smallSpacing
} }
} }
}
Connections { Connections {
target: Controller target: Controller
function onConnectionAdded() { function onConnectionAdded() {

15
imports/NeoChat/Page/DevicesPage.qml
View File

@@ -12,13 +12,10 @@ import org.kde.neochat 1.0
Kirigami.Page { Kirigami.Page {
title: i18n("Devices") title: i18n("Devices")
leftPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
topPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
rightPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
ColumnLayout {
anchors.fill: parent
Connections { Connections {
target: pageSettingStack target: pageSettingStack
@@ -30,8 +27,7 @@ Kirigami.Page {
Controls.ScrollView { Controls.ScrollView {
id: scroll id: scroll
Component.onCompleted: background.visible = pageSettingStack.wideMode Component.onCompleted: background.visible = pageSettingStack.wideMode
Layout.fillWidth: true anchors.fill: parent
Layout.fillHeight: true
ListView { ListView {
clip: true clip: true
model: DevicesModel { model: DevicesModel {
@@ -80,7 +76,6 @@ Kirigami.Page {
} }
} }
} }
}
Kirigami.OverlaySheet { Kirigami.OverlaySheet {
id: passwordSheet id: passwordSheet

8
imports/NeoChat/Settings/Emoticons.qml
View File

@@ -15,10 +15,10 @@ import NeoChat.Dialog 1.0
Kirigami.Page { Kirigami.Page {
leftPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
topPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
rightPadding: pageSettingStack.wideMode ? Kirigami.Units.gridUnit : 0 rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
ColumnLayout { ColumnLayout {
id: column id: column