Skip to content

Commit

Permalink
Add missing dismiss when aborted
Browse files Browse the repository at this point in the history
  • Loading branch information
bgoncal committed Feb 15, 2024
1 parent d0d5521 commit 0876bf7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ pod 'Version'
pod 'XCGLogger'

pod 'Starscream', git: 'https://github.com/zacwest/starscream', branch: 'ha-swift-api'
pod 'HAKit', git: 'https://github.com/home-assistant/HAKit.git', branch: 'main'
pod 'HAKit/PromiseKit', git: 'https://github.com/home-assistant/HAKit.git', branch: 'main'
pod 'HAKit/Mocks', git: 'https://github.com/home-assistant/HAKit.git', branch: 'main'
pod 'HAKit', path: '../HAKit'
pod 'HAKit/PromiseKit', path: '../HAKit'
pod 'HAKit/Mocks', path: '../HAKit'

def test_pods
pod 'OHHTTPStubs/Swift'
Expand Down
26 changes: 11 additions & 15 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ PODS:
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.11.0):
- GoogleUtilities/Logger
- HAKit (0.3):
- HAKit/Core (= 0.3)
- HAKit/Core (0.3):
- HAKit (0.4):
- HAKit/Core (= 0.4)
- HAKit/Core (0.4):
- Starscream (~> 4.0.4)
- HAKit/Mocks (0.3):
- HAKit/Mocks (0.4):
- HAKit/Core
- HAKit/PromiseKit (0.3):
- HAKit/PromiseKit (0.4):
- HAKit/Core
- PromiseKit (~> 6.13)
- KeychainAccess (4.2.2)
Expand Down Expand Up @@ -128,9 +128,9 @@ DEPENDENCIES:
- EMTLoadingIndicator (from `https://github.com/hirokimu/EMTLoadingIndicator`, branch `master`)
- Eureka (from `https://github.com/xmartlabs/Eureka`, branch `master`)
- FirebaseMessaging
- HAKit (from `https://github.com/home-assistant/HAKit.git`, branch `main`)
- HAKit/Mocks (from `https://github.com/home-assistant/HAKit.git`, branch `main`)
- HAKit/PromiseKit (from `https://github.com/home-assistant/HAKit.git`, branch `main`)
- HAKit (from `../HAKit`)
- HAKit/Mocks (from `../HAKit`)
- HAKit/PromiseKit (from `../HAKit`)
- KeychainAccess
- lottie-ios
- MBProgressHUD (~> 1.2.0)
Expand Down Expand Up @@ -198,8 +198,7 @@ EXTERNAL SOURCES:
:branch: master
:git: https://github.com/xmartlabs/Eureka
HAKit:
:branch: main
:git: https://github.com/home-assistant/HAKit.git
:path: "../HAKit"
ObjectMapper:
:branch: master
:git: https://github.com/tristanhimmelman/ObjectMapper.git
Expand Down Expand Up @@ -229,9 +228,6 @@ CHECKOUT OPTIONS:
Eureka:
:commit: ba4ebbcc4e368e901de666870fc2a4524474a4c7
:git: https://github.com/xmartlabs/Eureka
HAKit:
:commit: 1f0202aaaaac56efceaa4df8d3546c9dfecb4c29
:git: https://github.com/home-assistant/HAKit.git
ObjectMapper:
:commit: a593b4d647a970b3d184d046f8f52b945083ccf9
:git: https://github.com/tristanhimmelman/ObjectMapper.git
Expand Down Expand Up @@ -259,7 +255,7 @@ SPEC CHECKSUMS:
FirebaseMessaging: 35ecbbc68ff547fca80f9326c9622e79288c7149
GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4
GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
HAKit: 5b5ed6dcd685f372fd76f0ef88f000924377794e
HAKit: 45fd77a3fa8cf4e50d59912ce50b9fe5382b6ffe
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
lottie-ios: b3846a9fa8ca1a1a3bebfa256ebe8b6fd4aaaaad
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
Expand All @@ -284,6 +280,6 @@ SPEC CHECKSUMS:
XCGLogger: 1943831ef907df55108b0b18657953f868de973b
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced

PODFILE CHECKSUM: 22fc24cfd665bd31532e7b68cf2aee22abb132b2
PODFILE CHECKSUM: 4b58d880271d40806365d0cfb5208f180c006716

COCOAPODS: 1.13.0
1 change: 1 addition & 0 deletions Sources/App/QRCodeScanner/BarcodeScannerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ struct BarcodeScannerView: View {
if let alternativeOptionLabel {
Button {
viewModel.aborted(.alternativeOptions)
dismiss()
} label: {
Text(alternativeOptionLabel)
.font(.subheadline)
Expand Down

0 comments on commit 0876bf7

Please sign in to comment.