added qr-code decoder for android

- 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

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)
}
}

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) {

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()
}
}
}

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 {