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

Update Settings NavBar 

Update FileManager
Update ObjectMapper
This commit is contained in:
femi 2022-07-15 01:24:46 +01:00 committed by Olufemi Ade-Olusile
parent 6604a0a94d
commit 971d12ff42
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/ui-test/src/screens/SettingsScreen.py
View File

@ -21,7 +21,7 @@ class MainScreenComponents(Enum):
class AdvancedOptionScreen(Enum):
ACTIVATE_OR_DEACTIVATE_WALLET: str = "o_StatusSettingsLineButton"
ACTIVATE_OR_DEACTIVATE_WALLET: str = "walletSettingsLineButton"
I_UNDERSTAND_POP_UP: str = "i_understand_StatusBaseText"

3
test/ui-test/src/screens/StatusMainScreen.py
View File

@ -18,7 +18,7 @@ class MainScreenComponents(Enum):
STATUS_ICON = "mainWindow_statusIcon_StatusIcon_2"
PUBLIC_CHAT_ICON = "mainWindow_public_chat_icon_StatusIcon"
JOIN_PUBLIC_CHAT = "join_public_chat_StatusMenuItemDelegate"
SETTINGS_BUTTON = "settings_icon_StatusIcon"
SETTINGS_BUTTON = "settings_navbar_settings_icon_StatusIcon"
class ChatNamePopUp(Enum):
@ -42,3 +42,4 @@ class StatusMainScreen:
def open_settings(self):
click_obj_by_name(MainScreenComponents.SETTINGS_BUTTON.value)

10
test/ui-test/src/utils/FileManager.py
View File

@ -1,13 +1,13 @@
import os, shutil
import os
import os.path as path
import shutil
def erase_directory(dir: str):
directory = path.abspath(path.join(__file__ , dir))
directory = path.abspath(path.join(__file__, dir))
if (os.path.isdir(directory)):
print(directory)
try:
shutil.rmtree(directory)
except OSError:
os.remove(directory)

7
test/ui-test/testSuites/suite_status/shared/scripts/names.py
View File

@ -89,7 +89,7 @@ mainWindow_Rectangle_4 = {"container": statusDesktop_mainWindow, "occurrence": 3
mainWindow_submitButton_StatusButton = {"container": statusDesktop_mainWindow, "id": "submitButton", "type": "StatusButton", "unnamed": 1, "visible": True}
i_understand_StatusBaseText = {"container": statusDesktop_mainWindow_overlay, "text": "I understand", "type": "StatusBaseText", "unnamed": 1, "visible": True}
mainWindow_navBarListView_ListView = {"container": statusDesktop_mainWindow, "id": "navBarListView", "type": "ListView", "unnamed": 1, "visible": True}
navBarListView_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "occurrence": 3, "type": "StatusNavBarTabButton", "unnamed": 1, "visible": True}
navBarListView_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "occurrence": 4, "type": "StatusNavBarTabButton", "unnamed": 1, "visible": True}
statusIcon_StatusIcon_3 = {"container": navBarListView_StatusNavBarTabButton, "id": "statusIcon", "source": "qrc:/StatusQ/src/assets/img/icons/settings.svg", "type": "StatusIcon", "unnamed": 1, "visible": True}
mainWindow_ScrollView = {"container": statusDesktop_mainWindow, "type": "ScrollView", "unnamed": 1, "visible": True}
privacy_and_security_StatusBaseText = {"container": mainWindow_ScrollView, "text": "Privacy and security", "type": "StatusBaseText", "unnamed": 1, "visible": True}
@ -148,5 +148,6 @@ get_started_StatusBaseText = {"container": statusDesktop_mainWindow_overlay, "te
mainWindow_submitBtn_StatusButton = {"container": statusDesktop_mainWindow, "id": "submitBtn", "type": "StatusButton", "unnamed": 1, "visible": True}
appearance_SettingsMenu_StatusNavigationListItem = {"container": mainWindow_ScrollView, "objectName": "Appearance-SettingsMenu", "type": "StatusNavigationListItem", "visible": True}
advanced_SettingsMenu_StatusNavigationListItem = {"container": mainWindow_ScrollView, "objectName": "Advanced-SettingsMenu", "type": "StatusNavigationListItem", "visible": True}
navBarListView_StatusNavBarTabButton_3 = {"checkable": True, "container": mainWindow_navBarListView_ListView, "occurrence": 4, "type": "StatusNavBarTabButton", "unnamed": 1, "visible": True}
settings_icon_StatusIcon = {"container": navBarListView_StatusNavBarTabButton_3, "objectName": "settings-icon", "source": "qrc:/StatusQ/src/assets/img/icons/settings.svg", "type": "StatusIcon", "visible": True}
walletSettingsLineButton = {"container": mainWindow_ScrollView_2, "objectName": "WalletSettingsLineButton", "type": "StatusSettingsLineButton", "visible": True}
navBarListView_Settings_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Settings-navbar", "type": "StatusNavBarTabButton", "visible": True}
settings_navbar_settings_icon_StatusIcon = {"container": navBarListView_Settings_navbar_StatusNavBarTabButton, "objectName": "settings-icon", "source": "qrc:/StatusQ/src/assets/img/icons/settings.svg", "type": "StatusIcon", "visible": True}

2
ui/app/AppLayouts/Profile/views/AdvancedView.qml
View File

@ -96,9 +96,11 @@ SettingsContentBase {
// TODO: replace with StatusQ component
StatusSettingsLineButton {
id: wallet
anchors.leftMargin: 0
anchors.rightMargin: 0
text: qsTr("Wallet")
objectName: qsTr("WalletSettingsLineButton")
isSwitch: true
switchChecked: localAccountSensitiveSettings.isWalletEnabled
onClicked: {

2
ui/app/mainui/AppMain.qml
View File

@ -250,6 +250,8 @@ Item {
}
regularNavBarButton: StatusNavBarTabButton {
id: navbar
objectName: model.name + "-navbar"
anchors.horizontalCenter: parent.horizontalCenter
name: model.icon.length > 0? "" : model.name
icon.name: model.icon