AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added qr-code decoder for android

Browse source 
- added color change for status and navigation bar for android
This commit is contained in:
vladimir.kuznetsov 2023-07-25 16:56:10 +09:00
parent b9a13d3a32
commit 0411792ca5
13 changed files with 255 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/ui/qml/Components/ShareConnectionDrawer.qml
View file

@ -54,10 +54,10 @@ DrawerType {
Layout.fillWidth: true
Layout.topMargin: 16
text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save connection code")
text: qsTr("Share")
onClicked: {
Qt.platform.os === "android" ? ExportController.shareFile() : ExportController.saveFile()
ExportController.saveFile()
}
}

14
client/ui/qml/Controls2/DrawerType.qml
View file

@ -12,6 +12,7 @@ Drawer {
velocity: 4
}
}
exit: Transition {
SmoothedAnimation {
velocity: 4
@ -31,4 +32,17 @@ Drawer {
Overlay.modal: Rectangle {
color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
}
onAboutToShow: {
if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
PageController.updateNavigationBarColor(0xFF1C1D21)
}
}
onClosed: {
var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
if (initialPageNavigationBarColor !== 0xFF1C1D21) {
PageController.updateNavigationBarColor(initialPageNavigationBarColor)
}
}
}

10
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View file

@ -13,6 +13,14 @@ import "../Config"
PageType {
id: root
Connections {
target: ImportController
function onQrDecodingFinished() {
goToPage(PageEnum.PageSetupWizardViewConfig)
}
}
FlickableType {
id: fl
anchors.top: parent.top
@ -77,7 +85,7 @@ It's okay if a friend passed the code.")
leftImageSource: "qrc:/images/controls/qr-code.svg"
clickedFunction: function() {
ImportController.extractConfigFromQr()
ImportController.startDecodingQr()
// goToPage(PageEnum.PageSetupWizardQrReader)
}
}

3
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -47,8 +47,7 @@ PageType {
} else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
goToPage(PageEnum.PageSettingsServersList, false)
} else {
var pagePath = PageController.getPagePath(PageEnum.PageStart)
stackView.replace(pagePath, { "objectName" : pagePath })
PageController.replaceStartPage()
}
if (isInstalledContainerFound) {

3
client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
View file

@ -30,8 +30,7 @@ PageType {
} else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
goToPage(PageEnum.PageSettingsServersList, false)
} else {
var pagePath = PageController.getPagePath(PageEnum.PageStart)
stackView.replace(pagePath, { "objectName" : pagePath })
PageController.replaceStartPage()
}
}
}

24
client/ui/qml/Pages2/PageStart.qml
View file

@ -1,6 +1,7 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Shapes
import PageEnum 1.0
@ -81,14 +82,27 @@ PageType {
anchors.bottom: parent.bottom
topPadding: 8
bottomPadding: 8//34
bottomPadding: 8
leftPadding: shareTabButton.visible ? 96 : 128
rightPadding: shareTabButton.visible ? 96 : 128
background: Rectangle {
border.width: 1
border.color: "#2C2D30"
color: "#1C1D21"
background: Shape {
width: parent.width
height: parent.height
ShapePath {
startX: 0
startY: 0
PathLine { x: width; y: 0 }
PathLine { x: width; y: height - 1 }
PathLine { x: 0; y: height - 1 }
PathLine { x: 0; y: 0 }
strokeWidth: 1
strokeColor: "#2C2D30"
fillColor: "#1C1D21"
}
}
TabImageButtonType {

1
client/ui/qml/main2.qml
View file

@ -50,6 +50,7 @@ Window {
while (rootStackView.depth > 1) {
rootStackView.pop()
}
PageController.updateNavigationBarColor(PageController.getInitialPageNavigationBarColor())
rootStackView.replace(pagePath, { "objectName" : pagePath })
}