status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(SettingsContentBase): Dirty bubble horizontally centered correctly 

Manual calculation of bubble postion to be correctly centered due to the usage of `SettingsContentBase` as a centralPanel component that already has a default left margin value.
This commit is contained in:
Noelia 2024-03-04 16:57:27 +01:00 committed by Noelia
parent d12641264a
commit 954b25a54c
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -132,6 +132,7 @@ StatusSectionLayout {
sourceComponent: MyProfileView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
walletAssetsStore: root.walletAssetsStore
currencyStore: root.currencyStore
@ -153,6 +154,7 @@ StatusSectionLayout {
sourceComponent: ChangePasswordView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
privacyStore: root.store.privacyStore
passwordStrengthScoreFunction: SharedStores.RootStore.getPasswordStrengthScore
contentWidth: d.contentWidth
@ -166,6 +168,7 @@ StatusSectionLayout {
sourceComponent: ContactsView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
contactsStore: root.store.contactsStore
sectionTitle: qsTr("Contacts")
contentWidth: d.contentWidth
@ -198,6 +201,7 @@ StatusSectionLayout {
sourceComponent: MessagingView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
advancedStore: root.store.advancedStore
messagingStore: root.store.messagingStore
sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.messaging)
@ -213,6 +217,7 @@ StatusSectionLayout {
sourceComponent: WalletView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
rootStore: root.store
tokensStore: root.tokensStore
networkConnectionStore: root.networkConnectionStore
@ -231,6 +236,7 @@ StatusSectionLayout {
sourceComponent: AppearanceView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
appearanceStore: root.store.appearanceStore
sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.appearance)
@ -245,6 +251,7 @@ StatusSectionLayout {
sourceComponent: LanguageView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
languageStore: root.store.languageStore
currencyStore: root.currencyStore
@ -259,6 +266,7 @@ StatusSectionLayout {
sourceComponent: NotificationsView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
notificationsStore: root.store.notificationsStore
sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.notifications)
@ -272,6 +280,7 @@ StatusSectionLayout {
sourceComponent: SyncingView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
isProduction: production
profileStore: root.store.profileStore
@ -289,6 +298,7 @@ StatusSectionLayout {
sourceComponent: BrowserView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
store: root.store
accountSettings: localAccountSensitiveSettings
@ -303,6 +313,7 @@ StatusSectionLayout {
sourceComponent: AdvancedView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
messagingStore: root.store.messagingStore
advancedStore: root.store.advancedStore
@ -320,6 +331,7 @@ StatusSectionLayout {
implicitHeight: parent.height
sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.about)
contentWidth: d.contentWidth
leftParentLayoutMargin: d.leftMargin
store: QtObject {
readonly property bool isProduction: production
@ -358,6 +370,7 @@ StatusSectionLayout {
sourceComponent: CommunitiesView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
profileSectionStore: root.store
rootStore: root.globalStore
@ -375,6 +388,7 @@ StatusSectionLayout {
sourceComponent: KeycardView {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
profileSectionStore: root.store
keycardStore: root.store.keycardStore
@ -393,6 +407,7 @@ StatusSectionLayout {
sourceComponent: SettingsContentBase {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
sectionTitle: "Status Software Terms of Use"
contentWidth: d.contentWidth
@ -413,6 +428,7 @@ StatusSectionLayout {
sourceComponent: SettingsContentBase {
implicitWidth: parent.width
implicitHeight: parent.height
leftParentLayoutMargin: d.leftMargin
sectionTitle: "Status Software Privacy Statement"
contentWidth: d.contentWidth

12
ui/app/AppLayouts/Profile/views/SettingsContentBase.qml
View File

@ -23,6 +23,11 @@ FocusScope {
default property alias content: contentWrapper.children
property alias titleLayout: titleLayout
// This is the margin set up to the parent when using `SettingsContentBase` inside central
// panel property of `StatusSectionLayout` and needs to be taken into account to counteract it
// when trying to align horizontally the save toast component
required property int leftParentLayoutMargin
property bool dirty: false
// Used to configure the dirty behaviour of the settings page as a must blocker notification when
@ -152,7 +157,12 @@ FocusScope {
id: settingsDirtyToastMessage
anchors.bottom: scrollView.bottom
anchors.bottomMargin: d.bottomDirtyToastMargin
anchors.horizontalCenter: scrollView.horizontalCenter
// Left anchors and margin added bc of the implementation of the `SettingsContentBase` parent margin and to avoid
// this toast to be wrongly centered
anchors.left: root.left
anchors.leftMargin: -root.leftParentLayoutMargin / 2 + (root.width / 2 - width / 2)
active: root.dirty
flickable: root.autoscrollWhenDirty ? scrollView.flickable : null
saveChangesButtonEnabled: root.saveChangesButtonEnabled