Skip to content

WIP feat(PrimaryNavSidebar): integrate into AppMain and other flows #19623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
caybro wants to merge 1 commit into
base: 19593-adaptive-navigation-primary-nav-sidebar-poc
Choose a base branch
from
+213 −959
Draft

WIP feat(PrimaryNavSidebar): integrate into AppMain and other flows #19623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions storybook/pages/PrimaryNavSidebarPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,11 @@ SplitView {
showCreateCommunityBadge: ctrlShowCreateCommunityBadge.checked
profileSectionHasNotification: ctrlSettingsHasNotification.checked

onItemActivated: function (sectionType, id) {
onItemActivated: function (sectionType, sectionId) {
logs.logEvent("onItemActivated", ["sectionType", "sectionId"], arguments)
sectionsModel.setActiveSection(id)
sectionsModel.setActiveSection(sectionId)
d.activeSectionType = sectionType
d.activeSectionId = id
d.activeSectionId = sectionId
}
onActivityCenterRequested: function (shouldShow) {
logs.logEvent("onActivityCenterRequested", ["shouldShow"], arguments)
Expand Down
101 changes: 0 additions & 101 deletions storybook/pages/StatusAppNavBarPage.qml
View file
Open in desktop

This file was deleted.

141 changes: 0 additions & 141 deletions storybook/pages/StatusNavBarTabButtonPage.qml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions storybook/pages/StatusSectionLayoutPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ Page {
centerPanel: centerPanelCheckBox.checked ? centerPanel : null
rightPanel: rightPanel
showRightPanel: rightPanelCheckBox.checked
navBar: navBarItem
footer: footerItem
headerContent: headerContent
headerBackground: Control {
Expand All @@ -155,4 +154,4 @@ Page {
}
}
}
}
}
1 change: 0 additions & 1 deletion test/e2e/gui/objects_map/messaging_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
statusToolBar_Confirm_StatusButton = {"checkable": False, "container": mainWindow_statusToolBar_StatusToolBar, "objectName": "inlineSelectorConfirmButton", "type": "StatusButton", "visible": True}
statusToolBar_Cancel_StatusButton = {"checkable": False, "container": mainWindow_statusToolBar_StatusToolBar, "type": "StatusButton", "unnamed": 1, "visible": True}
statusToolBar_StatusTagItem = {"container": mainWindow_statusToolBar_StatusToolBar, "type": "StatusTagItem", "visible": True}
statusToolBar_notificationButton_StatusActivityCenterButton = {"container": statusDesktop_mainWindow, "objectName": "activityCenterNotificationsButton", "type": "StatusActivityCenterButton", "visible": True}

# Chat View
mainWindow_ChatColumnView = {"container": mainWindow_chatView_ChatView, "type": "ChatColumnView", "unnamed": 1, "visible": True}
Expand Down
16 changes: 8 additions & 8 deletions test/e2e/gui/objects_map/names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,34 +41,34 @@

# First half of left main panel: home button, chat button, wallet button, market button

homeButton = {"checkable": True, "container": mainWindow_LeftPanelNavBar, "objectName": "Home Page-navbar", "type": "StatusNavBarTabButton", "visible": True}
homeButton = {"checkable": True, "container": mainWindow_LeftPanelNavBar, "objectName": "Home Page-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
walletChatSwapNavBarList = {"container": mainWindow_LeftPanelNavBar, "objectName": "statusChatNavBarListView",
"type": "ListView", "visible": True}
mainWalletButton = {"container": walletChatSwapNavBarList, "objectName": "Wallet-navbar",
"type": "StatusNavBarTabButton", "visible": True}
chatButton = {"container": walletChatSwapNavBarList, "objectName": "Messages-navbar", "type": "StatusNavBarTabButton",
"type": "PrimaryNavSidebarButton", "visible": True}
chatButton = {"container": walletChatSwapNavBarList, "objectName": "Messages-navbar", "type": "PrimaryNavSidebarButton",
"visible": True}

# Second half of left main panel: communities button, settings button
communitiesSettingsNavBarList = {"container": statusDesktop_mainWindow, "objectName": "statusMainNavBarListView",
"type": "ListView", "visible": True}
communitiesPortalButton = {"container": communitiesSettingsNavBarList, "objectName": "Communities Portal-navbar",
"type": "StatusNavBarTabButton", "visible": True}
"type": "PrimaryNavSidebarButton", "visible": True}
settingsGearButton = {"container": communitiesSettingsNavBarList, "objectName": "Settings-navbar",
"type": "StatusNavBarTabButton", "visible": True}
activityCenterButton = {"container": communitiesSettingsNavBarList, "objectName": "Activity Center-navbar", "type": "StatusNavBarTabButton", "visible": True}
"type": "PrimaryNavSidebarButton", "visible": True}
activityCenterButton = {"container": communitiesSettingsNavBarList, "objectName": "Activity Center-navbar", "type": "PrimaryNavSidebarButton", "visible": True}

# Online identifier
onlineIdentifierButton = {"container": mainWindow_LeftPanelNavBar, "objectName": "statusProfileNavBarTabButton",
"type": "StatusNavBarTabButton", "visible": True}
"type": "PrimaryNavSidebarButton", "visible": True}

mainWindow_statusCommunityMainNavBarListView_ListView = {"container": statusDesktop_mainWindow,
"objectName": "statusCommunityMainNavBarListView",
"type": "ListView", "visible": True}
statusCommunityMainNavBarListView_CommunityNavBarButton = {"checkable": True,
"container": mainWindow_statusCommunityMainNavBarListView_ListView,
"objectName": "CommunityNavBarButton",
"type": "StatusNavBarTabButton", "visible": True}
"type": "PrimaryNavSidebarButton", "visible": True}
scrollView_Add_members_StatusButton = {"container": mainWindow_scrollView_StatusScrollView,
"objectName": "CommunityWelcomeBannerPanel_AddMembersButton",
"type": "StatusButton", "visible": True}
Expand Down
6 changes: 3 additions & 3 deletions test/ui-test/src/screens/StatusMainScreen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ class MainScreenComponents(Enum):
PROFILE_NAVBAR_BUTTON = 'mainWindow_ProfileNavBarButton'
MAIN_WINDOW = "statusDesktop_mainWindow"
POPUP_OVERLAY = "statusDesktop_mainWindow_overlay"
CHAT_NAVBAR_ICON = "navBarListView_Chat_navbar_StatusNavBarTabButton"
COMMUNITY_PORTAL_BUTTON = "navBarListView_Communities_Portal_navbar_StatusNavBarTabButton"
SETTINGS_BUTTON = "navBarListView_Settings_navbar_StatusNavBarTabButton"
CHAT_NAVBAR_ICON = "navBarListView_Chat_navbar_PrimaryNavSidebarButton"
COMMUNITY_PORTAL_BUTTON = "navBarListView_Communities_Portal_navbar_PrimaryNavSidebarButton"
SETTINGS_BUTTON = "navBarListView_Settings_navbar_PrimaryNavSidebarButton"
WALLET_BUTTON = "wallet_navbar_wallet_icon_StatusIcon"
START_CHAT_BTN = "mainWindow_startChat"
CHAT_LIST = "chatList"
Expand Down
4 changes: 2 additions & 2 deletions test/ui-test/testSuites/global_shared/scripts/global_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
statusDesktop_mainWindow_AppMain_EmojiPopup_SearchTextInput = {"container": statusDesktop_mainWindow_overlay, "objectName": "StatusEmojiPopup_searchBox", "type": "TextEdit", "visible": True}
mainWindow_ScrollView = {"container": statusDesktop_mainWindow, "type": "StatusScrollView", "unnamed": 1, "visible": True}
mainWindow_ScrollView_2 = {"container": statusDesktop_mainWindow, "occurrence": 2, "type": "StatusScrollView", "unnamed": 1, "visible": True}
mainWindow_ProfileNavBarButton = {"container": statusDesktop_mainWindow, "objectName": "statusProfileNavBarTabButton", "type": "StatusNavBarTabButton", "visible": True}
mainWindow_ProfileNavBarButton = {"container": statusDesktop_mainWindow, "objectName": "statusProfileNavBarTabButton", "type": "PrimaryNavSidebarButton", "visible": True}
mainWindow_ProfileSettingsView = {"container": statusDesktop_mainWindow, "objectName": "myProfileSettingsView", "type": "ColumnLayout", "visible": True}
settings_navbar_settings_icon_StatusIcon = {"container": mainWindow_navBarListView_ListView, "objectName": "settings-icon", "type": "StatusIcon", "visible": True}
splashScreen = {"container": statusDesktop_mainWindow, "objectName": "splashScreen", "type": "DidYouKnowSplashScreen"}
Expand Down Expand Up @@ -41,7 +41,7 @@

# Main Window - chat related:
mainWindow_statusChatNavBarListView_ListView = {"container": statusDesktop_mainWindow, "objectName": "statusChatNavBarListView", "type": "ListView", "visible": True}
navBarListView_Chat_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_statusChatNavBarListView_ListView, "objectName": "Messages-navbar", "type": "StatusNavBarTabButton", "visible": True}
navBarListView_Chat_navbar_PrimaryNavSidebarButton = {"checkable": True, "container": mainWindow_statusChatNavBarListView_ListView, "objectName": "Messages-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
chatList_ListView = {"container": statusDesktop_mainWindow, "objectName": "chatListItems", "type": "StatusListView", "visible": True}
chatList = {"container": statusDesktop_mainWindow, "objectName": "ContactsColumnView_chatList", "type": "StatusChatList"}
mainWindow_startChat = {"checkable": True, "container": statusDesktop_mainWindow, "objectName": "startChatButton", "type": "StatusIconTabButton"}
Expand Down
2 changes: 1 addition & 1 deletion test/ui-test/testSuites/global_shared/scripts/settings_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SettingsSubsection(Enum):
BACKUP_SEED: str = "18" + _MAIN_MENU_ITEM_OBJ_NAME

# Main:
navBarListView_Settings_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Settings-navbar", "type": "StatusNavBarTabButton", "visible": True}
navBarListView_Settings_navbar_PrimaryNavSidebarButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Settings-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
settingsSave_StatusButton = {"container": statusDesktop_mainWindow, "objectName": "settingsDirtyToastMessageSaveButton", "type": "StatusButton", "visible": True}
settings_Sidebar_ENS_Item = {"container": mainWindow_ScrollView, "objectName": SettingsSubsection.ENS_USERNAMES.value, "type": "StatusNavigationListItem"}
settingsContentBase_ScrollView = {"container": statusDesktop_mainWindow, "objectName": "settingsContentBaseScrollView", "type": "StatusScrollView", "visible": True}
Expand Down
4 changes: 2 additions & 2 deletions test/ui-test/testSuites/global_shared/scripts/wallet_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
addAccountPopup_GeneratedAddressesListPageIndicatior_StatusPageIndicator = {"container": statusDesktop_mainWindow_overlay_popup2, "objectName": "AddAccountPopup-GeneratedAddressesListPageIndicatior", "type": "StatusPageIndicator", "visible": True}
page_StatusBaseButton = {"checkable": False, "container": addAccountPopup_GeneratedAddressesListPageIndicatior_StatusPageIndicator, "objectName": RegularExpression("Page-*"), "type": "StatusBaseButton", "visible": True}

navBarListView_Wallet_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Wallet-navbar", "type": "StatusNavBarTabButton", "visible": True}
wallet_navbar_wallet_icon_StatusIcon = {"container": navBarListView_Wallet_navbar_StatusNavBarTabButton, "objectName": "wallet-icon", "type": "StatusIcon", "visible": True}
navBarListView_Wallet_navbar_PrimaryNavSidebarButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Wallet-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
wallet_navbar_wallet_icon_StatusIcon = {"container": navBarListView_Wallet_navbar_PrimaryNavSidebarButton, "objectName": "wallet-icon", "type": "StatusIcon", "visible": True}

mainWallet_Address_Panel = {"container": statusDesktop_mainWindow, "objectName": "addressPanel", "type": "StatusAddressPanel", "visible": True}
mainWallet_Add_Account_Button = {"container": statusDesktop_mainWindow, "objectName": "addAccountButton", "type": "StatusRoundButton", "visible": True}
Expand Down
Loading