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>
351 lines
13 KiB
QML
351 lines
13 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ContainerProps 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
Connections {
|
|
target: InstallController
|
|
|
|
function onUpdateContainerFinished() {
|
|
PageController.showNotificationMessage(qsTr("Settings updated successfully"))
|
|
}
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: backButtonLayout
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
anchors.topMargin: 20
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
}
|
|
}
|
|
|
|
FlickableType {
|
|
id: fl
|
|
anchors.top: backButtonLayout.bottom
|
|
anchors.bottom: parent.bottom
|
|
contentHeight: listview.implicitHeight
|
|
|
|
ListView {
|
|
id: listview
|
|
|
|
width: parent.width
|
|
height: listview.contentItem.height
|
|
|
|
clip: true
|
|
interactive: false
|
|
|
|
model: Socks5ProxyConfigModel
|
|
|
|
onFocusChanged: {
|
|
if (focus) {
|
|
listview.currentItem.focusItemId.forceActiveFocus()
|
|
}
|
|
}
|
|
|
|
delegate: Item {
|
|
implicitWidth: listview.width
|
|
implicitHeight: content.implicitHeight
|
|
|
|
property alias focusItemId: hostLabel.rightButton
|
|
|
|
ColumnLayout {
|
|
id: content
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
spacing: 0
|
|
|
|
HeaderType {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
headerText: qsTr("SOCKS5 settings")
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: hostLabel
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 32
|
|
|
|
parentFlickable: fl
|
|
|
|
text: qsTr("Host")
|
|
descriptionText: ServersModel.getProcessedServerData("hostName")
|
|
|
|
descriptionOnTop: true
|
|
|
|
rightImageSource: "qrc:/images/controls/copy.svg"
|
|
rightImageColor: AmneziaStyle.color.paleGray
|
|
|
|
clickedFunction: function() {
|
|
GC.copyToClipBoard(descriptionText)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
if (!GC.isMobile()) {
|
|
this.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: portLabel
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Port")
|
|
descriptionText: port
|
|
|
|
descriptionOnTop: true
|
|
|
|
parentFlickable: fl
|
|
|
|
rightImageSource: "qrc:/images/controls/copy.svg"
|
|
rightImageColor: AmneziaStyle.color.paleGray
|
|
|
|
clickedFunction: function() {
|
|
GC.copyToClipBoard(descriptionText)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
if (!GC.isMobile()) {
|
|
this.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: usernameLabel
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("User name")
|
|
descriptionText: username
|
|
|
|
descriptionOnTop: true
|
|
|
|
parentFlickable: fl
|
|
|
|
rightImageSource: "qrc:/images/controls/copy.svg"
|
|
rightImageColor: AmneziaStyle.color.paleGray
|
|
|
|
clickedFunction: function() {
|
|
GC.copyToClipBoard(descriptionText)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
if (!GC.isMobile()) {
|
|
this.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: passwordLabel
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Password")
|
|
descriptionText: password
|
|
|
|
descriptionOnTop: true
|
|
|
|
parentFlickable: fl
|
|
|
|
rightImageSource: "qrc:/images/controls/copy.svg"
|
|
rightImageColor: AmneziaStyle.color.paleGray
|
|
|
|
buttonImageSource: hideDescription ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
|
|
|
|
clickedFunction: function() {
|
|
GC.copyToClipBoard(descriptionText)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
if (!GC.isMobile()) {
|
|
this.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: changeSettingsDrawer
|
|
parent: root
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: root.height * 0.9
|
|
|
|
expandedStateContent: ColumnLayout {
|
|
property string tempPort: port
|
|
property string tempUsername: username
|
|
property string tempPassword: password
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 32
|
|
anchors.leftMargin: 16
|
|
anchors.rightMargin: 16
|
|
spacing: 0
|
|
|
|
Connections {
|
|
target: changeSettingsDrawer
|
|
function onOpened() {
|
|
tempPort = port
|
|
tempUsername = username
|
|
tempPassword = password
|
|
}
|
|
function onClosed() {
|
|
port = tempPort
|
|
username = tempUsername
|
|
password = tempPassword
|
|
portTextField.textFieldText = port
|
|
usernameTextField.textFieldText = username
|
|
passwordTextField.textFieldText = password
|
|
}
|
|
}
|
|
|
|
HeaderType {
|
|
Layout.fillWidth: true
|
|
|
|
headerText: qsTr("SOCKS5 settings")
|
|
}
|
|
|
|
TextFieldWithHeaderType {
|
|
id: portTextField
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 40
|
|
parentFlickable: fl
|
|
|
|
headerText: qsTr("Port")
|
|
textFieldText: port
|
|
textField.maximumLength: 5
|
|
textField.validator: IntValidator { bottom: 1; top: 65535 }
|
|
|
|
textField.onEditingFinished: {
|
|
textFieldText = textField.text.replace(/^\s+|\s+$/g, '')
|
|
if (textFieldText !== port) {
|
|
port = textFieldText
|
|
}
|
|
}
|
|
}
|
|
|
|
TextFieldWithHeaderType {
|
|
id: usernameTextField
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
parentFlickable: fl
|
|
|
|
headerText: qsTr("Username")
|
|
textFieldPlaceholderText: "username"
|
|
textFieldText: username
|
|
textField.maximumLength: 32
|
|
|
|
textField.onEditingFinished: {
|
|
textFieldText = textField.text.replace(/^\s+|\s+$/g, '')
|
|
if (textFieldText !== username) {
|
|
username = textFieldText
|
|
}
|
|
}
|
|
}
|
|
|
|
TextFieldWithHeaderType {
|
|
id: passwordTextField
|
|
|
|
property bool hidePassword: true
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
parentFlickable: fl
|
|
|
|
headerText: qsTr("Password")
|
|
textFieldPlaceholderText: "password"
|
|
textFieldText: password
|
|
textField.maximumLength: 32
|
|
|
|
textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
|
|
buttonImageSource: textFieldText !== "" ? (hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg")
|
|
: ""
|
|
|
|
clickedFunc: function() {
|
|
hidePassword = !hidePassword
|
|
}
|
|
|
|
textField.onFocusChanged: {
|
|
textFieldText = textField.text.replace(/^\s+|\s+$/g, '')
|
|
if (textFieldText !== password) {
|
|
password = textFieldText
|
|
}
|
|
}
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: saveButton
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 24
|
|
Layout.bottomMargin: 24
|
|
|
|
text: qsTr("Change connection settings")
|
|
|
|
clickedFunc: function() {
|
|
forceActiveFocus()
|
|
|
|
if (!portTextField.textField.acceptableInput) {
|
|
portTextField.errorText = qsTr("The port must be in the range of 1 to 65535")
|
|
return
|
|
}
|
|
if (usernameTextField.textFieldText && passwordTextField.textFieldText === "") {
|
|
passwordTextField.errorText = qsTr("Password cannot be empty")
|
|
return
|
|
} else if (usernameTextField.textFieldText === "" && passwordTextField.textFieldText) {
|
|
usernameTextField.errorText = qsTr("Username cannot be empty")
|
|
return
|
|
}
|
|
|
|
PageController.goToPage(PageEnum.PageSetupWizardInstalling)
|
|
InstallController.updateContainer(Socks5ProxyConfigModel.getConfig())
|
|
tempPort = portTextField.textFieldText
|
|
tempUsername = usernameTextField.textFieldText
|
|
tempPassword = passwordTextField.textFieldText
|
|
changeSettingsDrawer.closeTriggered()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: changeSettingsButton
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 24
|
|
Layout.bottomMargin: 24
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
text: qsTr("Change connection settings")
|
|
|
|
clickedFunc: function() {
|
|
forceActiveFocus()
|
|
changeSettingsDrawer.openTriggered()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|