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>
368 lines
13 KiB
QML
368 lines
13 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
import QtQuick.Dialogs
|
|
|
|
import QtCore
|
|
|
|
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"
|
|
|
|
DrawerType2 {
|
|
id: root
|
|
|
|
property string headerText
|
|
property string configContentHeaderText
|
|
property string contentVisible
|
|
|
|
property string configExtension: ".vpn"
|
|
property string configCaption: qsTr("Save AmneziaVPN config")
|
|
property string configFileName: "amnezia_config"
|
|
|
|
expandedHeight: parent.height * 0.9
|
|
|
|
onClosed: {
|
|
configExtension = ".vpn"
|
|
configCaption = qsTr("Save AmneziaVPN config")
|
|
configFileName = "amnezia_config"
|
|
}
|
|
|
|
expandedStateContent: Item {
|
|
implicitHeight: root.expandedHeight
|
|
|
|
Header2Type {
|
|
id: header
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 20
|
|
anchors.leftMargin: 16
|
|
anchors.rightMargin: 16
|
|
|
|
headerText: root.headerText
|
|
}
|
|
|
|
ListView {
|
|
id: listView
|
|
|
|
anchors.top: header.bottom
|
|
anchors.bottom: parent.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
property bool isFocusable: true
|
|
|
|
ScrollBar.vertical: ScrollBarType {}
|
|
|
|
model: 1
|
|
|
|
clip: true
|
|
reuseItems: true
|
|
|
|
header: ColumnLayout {
|
|
width: listView.width
|
|
|
|
visible: root.contentVisible
|
|
|
|
BasicButtonType {
|
|
id: shareButton
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
text: qsTr("Share")
|
|
leftImageSource: "qrc:/images/controls/share-2.svg"
|
|
|
|
clickedFunc: function() {
|
|
var fileName = ""
|
|
if (GC.isMobile()) {
|
|
fileName = configFileName + configExtension
|
|
} else {
|
|
fileName = SystemController.getFileName(configCaption,
|
|
qsTr("Config files (*" + configExtension + ")"),
|
|
StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName,
|
|
true,
|
|
configExtension)
|
|
}
|
|
if (fileName !== "") {
|
|
PageController.showBusyIndicator(true)
|
|
ExportController.exportConfig(fileName)
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
}
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: copyConfigTextButton
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 8
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.paleGray
|
|
borderWidth: 1
|
|
|
|
text: qsTr("Copy")
|
|
leftImageSource: "qrc:/images/controls/copy.svg"
|
|
|
|
Keys.onReturnPressed: { copyConfigTextButton.clicked() }
|
|
Keys.onEnterPressed: { copyConfigTextButton.clicked() }
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: copyNativeConfigStringButton
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 8
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: false
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.paleGray
|
|
borderWidth: 1
|
|
|
|
text: qsTr("Copy config string")
|
|
leftImageSource: "qrc:/images/controls/copy.svg"
|
|
|
|
KeyNavigation.tab: showSettingsButton
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: showSettingsButton
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 24
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.paleGray
|
|
borderWidth: 1
|
|
|
|
text: qsTr("Show connection settings")
|
|
|
|
clickedFunc: function() {
|
|
configContentDrawer.openTriggered()
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: configContentDrawer
|
|
|
|
parent: root.parent
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.9
|
|
|
|
expandedStateContent: Item {
|
|
id: configContentContainer
|
|
|
|
implicitHeight: configContentDrawer.expandedHeight
|
|
|
|
Connections {
|
|
target: copyNativeConfigStringButton
|
|
function onClicked() {
|
|
nativeConfigString.selectAll()
|
|
nativeConfigString.copy()
|
|
nativeConfigString.select(0, 0)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: copyConfigTextButton
|
|
function onClicked() {
|
|
configText.selectAll()
|
|
configText.copy()
|
|
configText.select(0, 0)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
header.forceActiveFocus()
|
|
}
|
|
}
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 16
|
|
|
|
backButtonFunction: function() { configContentDrawer.closeTriggered() }
|
|
}
|
|
|
|
FlickableType {
|
|
anchors.top: backButton.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
|
|
|
|
ColumnLayout {
|
|
id: configContent
|
|
|
|
anchors.fill: parent
|
|
anchors.rightMargin: 16
|
|
anchors.leftMargin: 16
|
|
|
|
Header2Type {
|
|
id: configContentHeader
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
|
|
headerText: root.configContentHeaderText
|
|
}
|
|
|
|
TextField {
|
|
id: nativeConfigString
|
|
visible: false
|
|
text: ExportController.nativeConfigString
|
|
|
|
onTextChanged: {
|
|
copyNativeConfigStringButton.visible = nativeConfigString.text !== ""
|
|
}
|
|
}
|
|
|
|
TextArea {
|
|
id: configText
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
Layout.bottomMargin: 16
|
|
|
|
padding: 0
|
|
leftPadding: 0
|
|
height: 24
|
|
|
|
readOnly: true
|
|
activeFocusOnTab: false
|
|
|
|
color: AmneziaStyle.color.paleGray
|
|
selectionColor: AmneziaStyle.color.richBrown
|
|
selectedTextColor: AmneziaStyle.color.paleGray
|
|
|
|
font.pixelSize: 16
|
|
font.weight: Font.Medium
|
|
font.family: "PT Root UI VF"
|
|
|
|
text: ExportController.config
|
|
|
|
wrapMode: Text.Wrap
|
|
|
|
background: Rectangle {
|
|
color: AmneziaStyle.color.transparent
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
delegate: ColumnLayout {
|
|
width: listView.width
|
|
|
|
Rectangle {
|
|
id: qrCodeContainer
|
|
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: width
|
|
Layout.topMargin: 20
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: ExportController.qrCodesCount > 0
|
|
|
|
color: "white"
|
|
|
|
Image {
|
|
anchors.fill: parent
|
|
smooth: false
|
|
|
|
source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""
|
|
|
|
property bool isFocusable: true
|
|
|
|
Keys.onTabPressed: {
|
|
FocusController.nextKeyTabItem()
|
|
}
|
|
|
|
Keys.onBacktabPressed: {
|
|
FocusController.previousKeyTabItem()
|
|
}
|
|
|
|
Keys.onUpPressed: {
|
|
FocusController.nextKeyUpItem()
|
|
}
|
|
|
|
Keys.onDownPressed: {
|
|
FocusController.nextKeyDownItem()
|
|
}
|
|
|
|
Keys.onLeftPressed: {
|
|
FocusController.nextKeyLeftItem()
|
|
}
|
|
|
|
Keys.onRightPressed: {
|
|
FocusController.nextKeyRightItem()
|
|
}
|
|
|
|
Timer {
|
|
property int index: 0
|
|
interval: 1000
|
|
running: ExportController.qrCodesCount > 0
|
|
repeat: true
|
|
onTriggered: {
|
|
if (ExportController.qrCodesCount > 0) {
|
|
index++
|
|
if (index >= ExportController.qrCodesCount) {
|
|
index = 0
|
|
}
|
|
parent.source = ExportController.qrCodes[index]
|
|
}
|
|
}
|
|
}
|
|
|
|
Behavior on source {
|
|
PropertyAnimation { duration: 200 }
|
|
}
|
|
}
|
|
}
|
|
|
|
ParagraphTextType {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 24
|
|
Layout.bottomMargin: 32
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: ExportController.qrCodesCount > 0
|
|
|
|
horizontalAlignment: Text.AlignHCenter
|
|
text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|