6acaab0ffa
* add focusController class * add more key handlers * add focus navigation to qml * fixed language selector * add reverse focus change to FocusController * add default focus item * update transitions * update pages * add ListViewFocusController * fix ListView navigation * update CardType for using with focus navigation * remove useless key navigation * remove useless slots, logs, Drawer open and close * fix reverse focus move on listView * fix drawer radio buttons selection * fix drawer layout and focus move * fix PageSetupWizardProtocolSettings focus move * fix back navigation on default focus item * fix crashes after ListView navigation * fix protocol settings focus move * fix focus on users on page share * clean up page share * fix server rename * fix page share default server selection * refactor about page for correct focus move * fix focus move on list views with header and-or footer * minor fixes * fix server list back button handler * fix spawn signals on switch * fix share details drawer * fix drawer open close usage * refactor listViewFocusController * refactor focusController to make the logic more straightforward * fix focus on notification * update config page for scrolling with tab * fix crash on return with esc key * fix focus navigation in dynamic delegate of list view * fix focus move on qr code on share page * refactor page logging settings for focus navigation * update popup * Bump version * Add mandatory requirement for android.software.leanback. * Fix importing files on TVs * fix: add separate method for reading files to fix file reading on Android TV * fix(android): add CHANGE_NETWORK_STATE permission for all Android versions * Fix connection check for AWG/WG * chore: minor fixes (#1235) * fix: add a workaround to open files on Android TV due to lack of SAF * fix: change the banner format for TV * refactor: make TvFilePicker activity more sustainable * fix: add the touch emulation method for Android TV * fix: null uri processing * fix: add the touch emulation method for Android TV * fix: hide UI elements that use file saving * chore: bump version code * add `ScrollBarType` * update initial config page * refactor credentials setup page to handle the focus navigation * add `setDelegateIndex` method to `listViewFocusController` * fix focus behavior on new page/popup * make minor fixes and clean up * fix: get rid of the assign function call * Scrollbar is on if the content is larger than a screen * Fix selection in language change list * Update select language list * update logging settings page * fix checked item in lists * fix split tunneling settings * make unchangable properties readonly * refactor SwitcherType * fix hide/unhide password * `PageShare` readonly properties * Fix list view focus moving on `PageShare` * remove manual focus control on `PageShare` * format `ListViewFocusController` * format `FocusController` * add `focusControl` with utility functions for focus control * refactor `listViewFocusController` acoording to `focusControl` * refactor `focusConroller` according to `focusControl` * add `printSectionName` method to `listViewController` * remove arrow from `Close application` item * fix focus movement in `ServersListView` * `Restore from backup` is visible only on start screen * `I have nothing` is visible only on start screen * fix back button on `SelectLanguageDrawer` * rename `focusControl` to `qmlUtils` * fix `CMakeLists.txt` * fix `ScrollBarType` * fix `PageSetupWizardApiServicesList` * fix focus movement on dynamic delegates in listView * refactor `PageSetupWizardProtocols` * remove comments and clean up * fix `ListViewWithLabelsType` * fix `PageProtocolCloakSettings` * fix `PageSettingsAppSplitTunneling` * fix `PageDevMenu` * remove debug output from `FocusController` * remove debug output from `ListViewFocusController` * remove debug output from `focusControl` * `focusControl` => `FocusControl` --------- Co-authored-by: albexk <albexk@proton.me> Co-authored-by: Nethius <nethiuswork@gmail.com>
406 lines
15 KiB
QML
406 lines
15 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ProtocolEnum 1.0
|
|
import ContainerProps 1.0
|
|
import ContainersModelFilters 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
Connections {
|
|
objectName: "pageControllerConnections"
|
|
|
|
target: PageController
|
|
|
|
function onRestorePageHomeState(isContainerInstalled) {
|
|
drawer.openTriggered()
|
|
if (isContainerInstalled) {
|
|
containersDropDown.rootButtonClickedFunction()
|
|
}
|
|
}
|
|
}
|
|
|
|
Item {
|
|
objectName: "homeColumnItem"
|
|
|
|
anchors.fill: parent
|
|
anchors.bottomMargin: drawer.collapsedHeight
|
|
|
|
ColumnLayout {
|
|
objectName: "homeColumnLayout"
|
|
|
|
anchors.fill: parent
|
|
anchors.topMargin: 34
|
|
anchors.bottomMargin: 34
|
|
|
|
BasicButtonType {
|
|
id: loggingButton
|
|
objectName: "loggingButton"
|
|
|
|
property bool isLoggingEnabled: SettingsController.isLoggingEnabled
|
|
|
|
Layout.alignment: Qt.AlignHCenter
|
|
|
|
implicitHeight: 36
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
borderWidth: 0
|
|
|
|
visible: isLoggingEnabled ? true : false
|
|
text: qsTr("Logging enabled")
|
|
|
|
Keys.onEnterPressed: loggingButton.clicked()
|
|
Keys.onReturnPressed: loggingButton.clicked()
|
|
|
|
onClicked: {
|
|
PageController.goToPage(PageEnum.PageSettingsLogging)
|
|
}
|
|
}
|
|
|
|
ConnectButton {
|
|
id: connectButton
|
|
objectName: "connectButton"
|
|
|
|
Layout.fillHeight: true
|
|
Layout.alignment: Qt.AlignCenter
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: splitTunnelingButton
|
|
objectName: "splitTunnelingButton"
|
|
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
|
|
Layout.bottomMargin: 34
|
|
leftPadding: 16
|
|
rightPadding: 16
|
|
|
|
implicitHeight: 36
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
borderWidth: 0
|
|
|
|
buttonTextLabel.lineHeight: 20
|
|
buttonTextLabel.font.pixelSize: 14
|
|
buttonTextLabel.font.weight: 500
|
|
|
|
property bool isSplitTunnelingEnabled: SitesModel.isTunnelingEnabled || AppSplitTunnelingModel.isTunnelingEnabled ||
|
|
ServersModel.isDefaultServerDefaultContainerHasSplitTunneling
|
|
|
|
text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
|
|
|
|
leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
|
|
leftImageColor: ""
|
|
rightImageSource: "qrc:/images/controls/chevron-down.svg"
|
|
|
|
Keys.onEnterPressed: splitTunnelingButton.clicked()
|
|
Keys.onReturnPressed: splitTunnelingButton.clicked()
|
|
|
|
onClicked: {
|
|
homeSplitTunnelingDrawer.openTriggered()
|
|
}
|
|
|
|
HomeSplitTunnelingDrawer {
|
|
id: homeSplitTunnelingDrawer
|
|
objectName: "homeSplitTunnelingDrawer"
|
|
|
|
parent: root
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: drawer
|
|
objectName: "drawerProtocol"
|
|
|
|
anchors.fill: parent
|
|
|
|
collapsedStateContent: Item {
|
|
objectName: "ProtocolDrawerCollapsedContent"
|
|
|
|
implicitHeight: Qt.platform.os !== "ios" ? root.height * 0.9 : screen.height * 0.77
|
|
Component.onCompleted: {
|
|
drawer.expandedHeight = implicitHeight
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: collapsed
|
|
objectName: "collapsedColumnLayout"
|
|
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
spacing: 0
|
|
|
|
Component.onCompleted: {
|
|
drawer.collapsedHeight = collapsed.implicitHeight
|
|
}
|
|
|
|
DividerType {
|
|
Layout.topMargin: 10
|
|
Layout.fillWidth: false
|
|
Layout.preferredWidth: 20
|
|
Layout.preferredHeight: 2
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
}
|
|
|
|
RowLayout {
|
|
objectName: "rowLayout"
|
|
|
|
Layout.topMargin: 14
|
|
Layout.leftMargin: 24
|
|
Layout.rightMargin: 24
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
|
|
spacing: 0
|
|
|
|
Connections {
|
|
objectName: "drawerConnections"
|
|
|
|
target: drawer
|
|
function onCursorEntered() {
|
|
if (drawer.isCollapsedStateActive) {
|
|
collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
|
|
collapsedButtonHeader.opacity = 0.8
|
|
} else {
|
|
collapsedButtonHeader.opacity = 1
|
|
}
|
|
}
|
|
|
|
function onCursorExited() {
|
|
if (drawer.isCollapsedStateActive) {
|
|
collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
|
|
collapsedButtonHeader.opacity = 1
|
|
} else {
|
|
collapsedButtonHeader.opacity = 1
|
|
}
|
|
}
|
|
|
|
function onPressed(pressed, entered) {
|
|
if (drawer.isCollapsedStateActive) {
|
|
collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
|
|
collapsedButtonHeader.opacity = 0.7
|
|
} else {
|
|
collapsedButtonHeader.opacity = 1
|
|
}
|
|
}
|
|
}
|
|
|
|
Header1TextType {
|
|
id: collapsedButtonHeader
|
|
objectName: "collapsedButtonHeader"
|
|
|
|
Layout.maximumWidth: drawer.width - 48 - 18 - 12
|
|
|
|
maximumLineCount: 2
|
|
elide: Qt.ElideRight
|
|
|
|
text: ServersModel.defaultServerName
|
|
horizontalAlignment: Qt.AlignHCenter
|
|
|
|
Behavior on opacity {
|
|
PropertyAnimation { duration: 200 }
|
|
}
|
|
}
|
|
|
|
ImageButtonType {
|
|
id: collapsedButtonChevron
|
|
objectName: "collapsedButtonChevron"
|
|
|
|
Layout.leftMargin: 8
|
|
|
|
visible: drawer.isCollapsedStateActive()
|
|
|
|
hoverEnabled: false
|
|
image: "qrc:/images/controls/chevron-down.svg"
|
|
imageColor: AmneziaStyle.color.paleGray
|
|
|
|
icon.width: 18
|
|
icon.height: 18
|
|
backgroundRadius: 16
|
|
horizontalPadding: 4
|
|
topPadding: 4
|
|
bottomPadding: 3
|
|
|
|
Keys.onEnterPressed: collapsedButtonChevron.clicked()
|
|
Keys.onReturnPressed: collapsedButtonChevron.clicked()
|
|
|
|
onClicked: {
|
|
if (drawer.isCollapsedStateActive()) {
|
|
drawer.openTriggered()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
RowLayout {
|
|
objectName: "rowLayoutLabel"
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
Layout.topMargin: 8
|
|
Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 61 : 16
|
|
spacing: 0
|
|
|
|
BasicButtonType {
|
|
enabled: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsed
|
|
hoverEnabled: enabled
|
|
|
|
implicitHeight: 36
|
|
|
|
leftPadding: 16
|
|
rightPadding: 16
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.transparent
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
|
|
buttonTextLabel.lineHeight: 16
|
|
buttonTextLabel.font.pixelSize: 13
|
|
buttonTextLabel.font.weight: 400
|
|
|
|
text: drawer.isCollapsed ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
|
|
leftImageSource: ServersModel.defaultServerImagePathCollapsed
|
|
changeLeftImageSize: false
|
|
|
|
rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
|
|
|
|
onClicked: {
|
|
ServersModel.processedIndex = ServersModel.defaultIndex
|
|
PageController.goToPage(PageEnum.PageSettingsServerInfo)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: serversMenuHeader
|
|
objectName: "serversMenuHeader"
|
|
|
|
anchors.top: collapsed.bottom
|
|
anchors.right: parent.right
|
|
anchors.left: parent.left
|
|
|
|
RowLayout {
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
spacing: 8
|
|
|
|
visible: !ServersModel.isDefaultServerFromApi
|
|
|
|
DropDownType {
|
|
id: containersDropDown
|
|
objectName: "containersDropDown"
|
|
|
|
rootButtonImageColor: AmneziaStyle.color.midnightBlack
|
|
rootButtonBackgroundColor: AmneziaStyle.color.paleGray
|
|
rootButtonBackgroundHoveredColor: AmneziaStyle.color.mistyGray
|
|
rootButtonBackgroundPressedColor: AmneziaStyle.color.cloudyGray
|
|
rootButtonHoveredBorderColor: AmneziaStyle.color.transparent
|
|
rootButtonDefaultBorderColor: AmneziaStyle.color.transparent
|
|
rootButtonTextTopMargin: 8
|
|
rootButtonTextBottomMargin: 8
|
|
|
|
enabled: drawer.isOpened
|
|
|
|
text: ServersModel.defaultServerDefaultContainerName
|
|
textColor: AmneziaStyle.color.midnightBlack
|
|
headerText: qsTr("VPN protocol")
|
|
headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
|
|
|
|
rootButtonClickedFunction: function() {
|
|
containersDropDown.openTriggered()
|
|
}
|
|
|
|
drawerParent: root
|
|
|
|
listView: HomeContainersListView {
|
|
id: containersListView
|
|
objectName: "containersListView"
|
|
|
|
rootWidth: root.width
|
|
height: 500 // TODO: make calculated
|
|
|
|
Connections {
|
|
objectName: "rowLayoutConnections"
|
|
|
|
target: ServersModel
|
|
|
|
function onDefaultServerIndexChanged() {
|
|
updateContainersModelFilters()
|
|
}
|
|
}
|
|
|
|
function updateContainersModelFilters() {
|
|
if (ServersModel.isDefaultServerHasWriteAccess()) {
|
|
proxyDefaultServerContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
|
|
} else {
|
|
proxyDefaultServerContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
|
|
}
|
|
}
|
|
|
|
model: SortFilterProxyModel {
|
|
id: proxyDefaultServerContainersModel
|
|
sourceModel: DefaultServerContainersModel
|
|
|
|
sorters: [
|
|
RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
|
|
]
|
|
}
|
|
|
|
Component.onCompleted: updateContainersModelFilters()
|
|
}
|
|
}
|
|
}
|
|
|
|
Header2Type {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 48
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
headerText: qsTr("Servers")
|
|
}
|
|
}
|
|
|
|
ButtonGroup {
|
|
id: serversRadioButtonGroup
|
|
objectName: "serversRadioButtonGroup"
|
|
}
|
|
|
|
ServersListView {
|
|
id: serversMenuContent
|
|
objectName: "serversMenuContent"
|
|
|
|
isFocusable: false
|
|
|
|
Connections {
|
|
target: drawer
|
|
|
|
// this item shouldn't be focused when drawer is closed
|
|
function onIsOpenedChanged() {
|
|
serversMenuContent.isFocusable = drawer.isOpened
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|