Skip to content

Commit

Permalink
Merge pull request #6 from plangrid/marco/newCameraUI
Browse files Browse the repository at this point in the history 
Add new camera UI for Barcode Scanner
  • Loading branch information
@marco-evc
marco-evc authored Jan 27, 2022
2 parents 9f14c82 + 277e8ab commit a773c30
Show file tree
Hide file tree
Showing 9 changed files with 639 additions and 98 deletions.
16 changes: 16 additions & 0 deletions BarcodeScanner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
00B666FF230D44A900ABA25C /* CameraHeaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B666FE230D44A900ABA25C /* CameraHeaderViewController.swift */; };
00B6670C230DC61200ABA25C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 00B6670B230DC61200ABA25C /* [email protected] */; };
00B66712230E5BDD00ABA25C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 00B66711230E5BDD00ABA25C /* [email protected] */; };
0A03879C279A1ED2009AA963 /* AlloyScannerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A03879B279A1ED2009AA963 /* AlloyScannerConstants.swift */; };
0A2EEB0227988B270073833E /* BarcodeScannerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A2EEB0127988B270073833E /* BarcodeScannerModel.swift */; };
0A2EEB0427988B720073833E /* CameraControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A2EEB0327988B720073833E /* CameraControllerProtocol.swift */; };
0A2EEB0627988C440073833E /* AlloyScannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A2EEB0527988C440073833E /* AlloyScannerViewController.swift */; };
2DBF9E0E1F169DEF006B5AA8 /* FocusViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */; };
D504555F1FD8714700E46826 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D504555E1FD8714700E46826 /* UIView+Extensions.swift */; };
D50BE3E91C9FE7A80000A34C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E51C9FE7A80000A34C /* [email protected] */; };
Expand All @@ -33,6 +37,10 @@
00B666FE230D44A900ABA25C /* CameraHeaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraHeaderViewController.swift; sourceTree = "<group>"; };
00B6670B230DC61200ABA25C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
00B66711230E5BDD00ABA25C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
0A03879B279A1ED2009AA963 /* AlloyScannerConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlloyScannerConstants.swift; sourceTree = "<group>"; };
0A2EEB0127988B270073833E /* BarcodeScannerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarcodeScannerModel.swift; sourceTree = "<group>"; };
0A2EEB0327988B720073833E /* CameraControllerProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraControllerProtocol.swift; sourceTree = "<group>"; };
0A2EEB0527988C440073833E /* AlloyScannerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlloyScannerViewController.swift; sourceTree = "<group>"; };
2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = FocusViewType.swift; sourceTree = "<group>"; tabWidth = 2; };
D504555E1FD8714700E46826 /* UIView+Extensions.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; tabWidth = 2; };
D50BE3E51C9FE7A80000A34C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -79,6 +87,7 @@
D55281B42016758000FF3CDD /* Controllers */ = {
isa = PBXGroup;
children = (
0A2EEB0527988C440073833E /* AlloyScannerViewController.swift */,
00B666F4230D390800ABA25C /* FooterViewController.swift */,
D55281B92016770800FF3CDD /* CameraViewController.swift */,
D55281BB2016782C00FF3CDD /* BarcodeScannerViewController.swift */,
Expand Down Expand Up @@ -141,6 +150,9 @@
D5FC8AD61D252A12004BED88 /* State.swift */,
D5C4E08D1CA0BFB9008D9269 /* TorchMode.swift */,
2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */,
0A2EEB0127988B270073833E /* BarcodeScannerModel.swift */,
0A2EEB0327988B720073833E /* CameraControllerProtocol.swift */,
0A03879B279A1ED2009AA963 /* AlloyScannerConstants.swift */,
);
path = DataStructures;
sourceTree = "<group>";
Expand Down Expand Up @@ -258,6 +270,7 @@
buildActionMask = 2147483647;
files = (
D5C4E08F1CA0BFB9008D9269 /* TorchMode.swift in Sources */,
0A2EEB0227988B270073833E /* BarcodeScannerModel.swift in Sources */,
D55281C720168E7000FF3CDD /* NSLayoutConstraint+Extensions.swift in Sources */,
D55281BF20167DB400FF3CDD /* UIViewController+Extensions.swift in Sources */,
D55281BA2016770800FF3CDD /* CameraViewController.swift in Sources */,
Expand All @@ -266,7 +279,10 @@
D5CB3783201944DE00B9319D /* AVMetadataObject+Extensions.swift in Sources */,
D5CB377F2017ED2E00B9319D /* VideoPermissionService.swift in Sources */,
2DBF9E0E1F169DEF006B5AA8 /* FocusViewType.swift in Sources */,
0A2EEB0627988C440073833E /* AlloyScannerViewController.swift in Sources */,
D504555F1FD8714700E46826 /* UIView+Extensions.swift in Sources */,
0A03879C279A1ED2009AA963 /* AlloyScannerConstants.swift in Sources */,
0A2EEB0427988B720073833E /* CameraControllerProtocol.swift in Sources */,
00B666FF230D44A900ABA25C /* CameraHeaderViewController.swift in Sources */,
D5FC8AD71D252A12004BED88 /* State.swift in Sources */,
00B666F5230D390900ABA25C /* FooterViewController.swift in Sources */,
Expand Down
Loading

0 comments on commit a773c30

Please sign in to comment.