Skip to content

Commit

Permalink
fix(SettingsLeftTabView): fixup alignment of the Beta tag
Browse files Browse the repository at this point in the history
- use a dedicated StatusListItem slot for the beta tag icon
- rename (Settings/)LeftTabView.qml to SettingsLeftTabView to avoid
naming confusion with the same component from wallet
- add the component to SB with options to explore

Fixes: #16906
  • Loading branch information
caybro committed Jan 9, 2025
1 parent ada5f21 commit 06d5499
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 12 deletions.
79 changes: 79 additions & 0 deletions storybook/pages/SettingsLeftTabViewPage.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15

import StatusQ 0.1

import Models 1.0
import Storybook 1.0

import AppLayouts.Profile.views 1.0
import AppLayouts.Profile.helpers 1.0

SplitView {
id: root

orientation: Qt.Vertical

Logs { id: logs }

SettingsLeftTabView {
SplitView.fillWidth: true
SplitView.fillHeight: true

model: SettingsEntriesModel {
showWalletEntries: ctrlShowWalletEntries.checked
showBackUpSeed: ctrlShowBackUpSeed.checked
syncingBadgeCount: ctrlSyncingBadgeCount.value
messagingBadgeCount: ctrlMessagingBadgeCount.value
}
onMenuItemClicked: (event) => logs.logEvent("onMenuItemClicked", ["event"], arguments)
}

LogsAndControlsPanel {
id: logsAndControlsPanel

SplitView.minimumHeight: 100
SplitView.preferredHeight: 100
SplitView.fillWidth: true

logsView.logText: logs.logText

RowLayout {
spacing: 20
Layout.fillHeight: true

RowLayout {
Label { text: "Syncing badge count:" }
SpinBox {
id: ctrlSyncingBadgeCount
value: 1
from: 0
to: 999
}
}
RowLayout {
Label { text: "Messaging badge count:" }
SpinBox {
id: ctrlMessagingBadgeCount
value: 2
from: 0
to: 999
}
}
Switch {
id: ctrlShowBackUpSeed
checked: true
text: "Show backup seed"
}
Switch {
id: ctrlShowWalletEntries
checked: true
text: "Show wallet entries"
}
}
}
}

// category: Views
// status: good
2 changes: 1 addition & 1 deletion ui/app/AppLayouts/Profile/ProfileLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ StatusSectionLayout {
visible: profileContainer.currentIndex === Constants.settingsSubsection.wallet && !!root.store.walletStore.selectedAccount
}

leftPanel: LeftTabView {
leftPanel: SettingsLeftTabView {
anchors.fill: parent

model: settingsEntriesModel
Expand Down
15 changes: 4 additions & 11 deletions ui/app/AppLayouts/Profile/controls/SettingsList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,13 @@ StatusListView {
title: model.text
asset.name: model.icon
selected: root.currenctSubsection === model.subsection
highlighted: !!betaTagLoader.item && betaTagLoader.item.hovered
badge.value: model.badgeCount

Loader {
id: betaTagLoader
statusListItemTitleIcons.sourceComponent: model.isExperimental ? betaTagComponent : null

active: model.isExperimental
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: Theme.padding +
(delegate.badge.visible
? delegate.badge.width + Theme.halfPadding : 0)

sourceComponent: StatusBetaTag {
Component {
id: betaTagComponent
StatusBetaTag {
tooltipText: model.experimentalTooltip
cursorShape: Qt.PointingHandCursor
}
Expand Down
1 change: 1 addition & 0 deletions ui/app/AppLayouts/Profile/views/qmldir
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ LanguageView 1.0 LanguageView.qml
NotificationsView 1.0 NotificationsView.qml
PrivacyAndSecurityView 1.0 PrivacyAndSecurityView.qml
SyncingView 1.0 SyncingView.qml
SettingsLeftTabView 1.0 SettingsLeftTabView.qml

0 comments on commit 06d5499

Please sign in to comment.