-
Notifications
You must be signed in to change notification settings - Fork 279
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Thank you for submitting a Pull Request and helping to improve Home Assistant. Please complete the following sections to help the processing and review of your changes. Please do not delete anything from this template. --> ## Summary <!-- Provide a brief summary of the changes you have made and most importantly what they aim to achieve --> Add QR code scanner that can be triggered from HA and receive result response ## Screenshots <!-- If this is a user-facing change not in the frontend, please include screenshots in light and dark mode. --> https://github.com/home-assistant/iOS/assets/5808343/0e4d4f18-7507-44f2-8844-e701448943dd ## Link to pull request in Documentation repository <!-- Pull requests that add, change or remove functionality must have a corresponding pull request in the Companion App Documentation repository (https://github.com/home-assistant/companion.home-assistant). Please add the number of this pull request after the "#" --> Documentation: home-assistant/companion.home-assistant# ## Any other notes <!-- If there is any other information of note, like if this Pull Request is part of a bigger change, please include it here. -->
- Loading branch information
Showing
12 changed files
with
693 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| import Shared | ||
| import SwiftUI | ||
|
|
||
| struct BarcodeScannerView: View { | ||
| @Environment(\.dismiss) private var dismiss | ||
| @StateObject private var viewModel: BarcodeScannerViewModel | ||
| // Use single data model so both camera previews use same camera stream | ||
| @State private var cameraDataModel = BarcodeScannerDataModel() | ||
| private let cameraSquareSize: CGFloat = 320 | ||
| private let flashlightIcon = MaterialDesignIcons.flashlightIcon.image( | ||
| ofSize: .init(width: 24, height: 24), | ||
| color: .white | ||
| ) | ||
|
|
||
| private let title: String | ||
| private let description: String | ||
| private let alternativeOptionLabel: String? | ||
|
|
||
| init( | ||
| title: String, | ||
| description: String, | ||
| alternativeOptionLabel: String? = nil, | ||
| incomingMessageId: Int | ||
| ) { | ||
| self.title = title | ||
| self.description = description | ||
| self.alternativeOptionLabel = alternativeOptionLabel | ||
| self._viewModel = .init(wrappedValue: .init(incomingMessageId: incomingMessageId)) | ||
| } | ||
|
|
||
| var body: some View { | ||
| ZStack(alignment: .top) { | ||
| ZStack { | ||
| cameraBackground | ||
| cameraSquare | ||
| } | ||
| .ignoresSafeArea() | ||
| .frame(maxWidth: .infinity) | ||
| .frame(maxHeight: .infinity) | ||
|
|
||
| topInformation | ||
| } | ||
| .onAppear { | ||
| cameraDataModel.camera.qrFound = { code, format in | ||
| viewModel.scannedCode(code, format: format) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private var topInformation: some View { | ||
| VStack(spacing: 8) { | ||
| Button(action: { | ||
| viewModel.aborted(.canceled) | ||
| dismiss() | ||
| }, label: { | ||
| Image(systemName: "xmark") | ||
| .font(.title2) | ||
| .foregroundColor(.white.opacity(0.8)) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| }) | ||
| .accessibilityHint(.init(L10n.closeLabel)) | ||
| Group { | ||
| Text(title) | ||
| .padding(.top) | ||
| .font(.title2) | ||
| Text(description) | ||
| .font(.subheadline) | ||
| } | ||
| .foregroundColor(.white) | ||
|
|
||
| if let alternativeOptionLabel { | ||
| Button { | ||
| viewModel.aborted(.alternativeOptions) | ||
| dismiss() | ||
| } label: { | ||
| Text(alternativeOptionLabel) | ||
| .font(.subheadline) | ||
| .foregroundColor(.accentColor) | ||
| } | ||
| .padding(.top) | ||
| } | ||
| } | ||
| .padding() | ||
| } | ||
|
|
||
| private var cameraBackground: some View { | ||
| BarcodeScannerCameraView(model: cameraDataModel) | ||
| .ignoresSafeArea() | ||
| .frame(maxWidth: .infinity) | ||
| .frame(maxHeight: .infinity) | ||
| .overlay { | ||
| Color.black.opacity(0.8) | ||
| } | ||
| } | ||
|
|
||
| private var cameraSquare: some View { | ||
| BarcodeScannerCameraView(model: cameraDataModel, shouldStartCamera: false) | ||
| .ignoresSafeArea() | ||
| .frame(maxWidth: .infinity) | ||
| .frame(maxHeight: .infinity) | ||
| .mask { | ||
| RoundedRectangle(cornerSize: CGSize(width: 20, height: 20)) | ||
| .frame(width: cameraSquareSize, height: cameraSquareSize) | ||
| } | ||
| .overlay { | ||
| ZStack(alignment: .bottomTrailing) { | ||
| RoundedRectangle(cornerSize: CGSize(width: 20, height: 20)) | ||
| .stroke(Color.blue, lineWidth: 1) | ||
| .frame(width: cameraSquareSize, height: cameraSquareSize) | ||
| Button(action: { | ||
| toggleFlashlight() | ||
| }, label: { | ||
| Image(uiImage: flashlightIcon) | ||
| .padding() | ||
| .background(Color(uiColor: .init(hex: "#384956"))) | ||
| .mask(Circle()) | ||
| .offset(x: -22, y: -22) | ||
| }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private func toggleFlashlight() { | ||
| cameraDataModel.toggleFlashlight() | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| BarcodeScannerView(title: "Scan QR-code", description: "Find the code on your device", incomingMessageId: 1) | ||
| } | ||
|
|
||
| final class BarcodeScannerHostingController: UIHostingController<BarcodeScannerView> { | ||
| override var supportedInterfaceOrientations: UIInterfaceOrientationMask { | ||
| [.portrait] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import Foundation | ||
| import Shared | ||
|
|
||
| final class BarcodeScannerViewModel: ObservableObject { | ||
| enum AbortReason: String { | ||
| case canceled | ||
| case alternativeOptions = "alternative_options" | ||
| } | ||
|
|
||
| private let incomingMessageId: Int | ||
|
|
||
| init(incomingMessageId: Int) { | ||
| self.incomingMessageId = incomingMessageId | ||
| } | ||
|
|
||
| func scannedCode(_ code: String, format: String) { | ||
| Current.sceneManager.webViewWindowControllerPromise.then(\.webViewControllerPromise) | ||
| .done { [weak self] controller in | ||
| guard let incomingMessageId = self?.incomingMessageId else { return } | ||
| controller | ||
| .sendExternalBus(message: .init( | ||
| id: incomingMessageId, | ||
| command: WebViewExternalBusOutgoingMessage.barCodeScanResult.rawValue, | ||
| payload: [ | ||
| "rawValue": code, | ||
| "format": format, | ||
| ] | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| func aborted(_ reason: AbortReason) { | ||
| Current.sceneManager.webViewWindowControllerPromise.then(\.webViewControllerPromise) | ||
| .done { [weak self] controller in | ||
| guard let incomingMessageId = self?.incomingMessageId else { return } | ||
| controller.sendExternalBus(message: .init( | ||
| id: incomingMessageId, | ||
| command: WebViewExternalBusOutgoingMessage.barCodeScanAborted.rawValue, | ||
| payload: [ | ||
| "reason": reason.rawValue, | ||
| ] | ||
| )) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.