Skip to content

merge with master #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

merge with master #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3bc1931
fix
omarH2007 Jul 21, 2023
9f5dc8f
pod update
omarH2007 Jul 21, 2023
141ce58
fix
omarH2007 Jul 21, 2023
15c53fc
fix
omarH2007 Jul 22, 2023
26b4e50
fix
omarH2007 Jul 22, 2023
ffcd54e
fix
omarH2007 Jul 22, 2023
34522da
fux
omarH2007 Jul 22, 2023
7d3d642
fix
omarH2007 Jul 22, 2023
5a983ba
fix
omarH2007 Jul 22, 2023
36e00ee
fix
omarH2007 Jul 22, 2023
d72f9ea
fix
omarH2007 Jul 22, 2023
56b7ee0
fix
omarH2007 Jul 22, 2023
75ac1e5
fix
omarH2007 Jul 22, 2023
a2ef853
fixes
omarH2007 Aug 17, 2023
dc77fa1
small fix
omarH2007 Sep 5, 2023
c1c3d4e
small fix
omarH2007 Sep 5, 2023
632b689
fix header
omarH2007 Sep 6, 2023
2fcbe21
remove wating view
omarH2007 Dec 24, 2023
2c62cfd
feat: fixes
omarH2007 Mar 19, 2024
0ee9d01
Revert "feat: fixes"
omarH2007 Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed Art/BarcodeScannerIcon.png
View file
Open in desktop
Binary file not shown.
Binary file removed Art/BarcodeScannerPresentation.png
View file
Open in desktop
Binary file not shown.
Binary file removed Art/ExampleError.png
View file
Open in desktop
Binary file not shown.
Binary file removed Art/ExampleLoading.png
View file
Open in desktop
Binary file not shown.
Binary file removed Art/ExampleScanning.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion BarcodeScanner.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "BarcodeScanner"
s.summary = "Simple and beautiful barcode scanner."
s.version = "5.0.1"
s.version = "5.0.0"
s.homepage = "https://github.com/hyperoslo/BarcodeScanner"
s.license = 'MIT'
s.author = { "Hyper Interaktiv AS" => "ios@hyper.no" }
Expand Down
22 changes: 17 additions & 5 deletions BarcodeScanner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@

/* Begin PBXBuildFile section */
2DBF9E0E1F169DEF006B5AA8 /* FocusViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */; };
CE8C0771252FBBAF007FF4A4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE8C0770252FBBAF007FF4A4 /* Images.xcassets */; };
D504555F1FD8714700E46826 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D504555E1FD8714700E46826 /* UIView+Extensions.swift */; };
D50BE3E91C9FE7A80000A34C /* flashOff@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E51C9FE7A80000A34C /* flashOff@3x.png */; };
D50BE3EA1C9FE7A80000A34C /* flashOn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E61C9FE7A80000A34C /* flashOn@3x.png */; };
D50BE3EB1C9FE7A80000A34C /* info@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E71C9FE7A80000A34C /* info@3x.png */; };
D5349DF8201E42D900CD53EA /* cameraRotate@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D5349DF7201E42D900CD53EA /* cameraRotate@3x.png */; };
D55281B62016758F00FF3CDD /* HeaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B52016758F00FF3CDD /* HeaderViewController.swift */; };
D55281B8201675D500FF3CDD /* MessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B7201675D500FF3CDD /* MessageViewController.swift */; };
D55281BA2016770800FF3CDD /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B92016770800FF3CDD /* CameraViewController.swift */; };
Expand All @@ -25,8 +28,11 @@

/* Begin PBXFileReference section */
2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = FocusViewType.swift; sourceTree = "<group>"; tabWidth = 2; };
CE8C0770252FBBAF007FF4A4 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
D504555E1FD8714700E46826 /* UIView+Extensions.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; tabWidth = 2; };
D50BE3E51C9FE7A80000A34C /* flashOff@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "flashOff@3x.png"; sourceTree = "<group>"; };
D50BE3E61C9FE7A80000A34C /* flashOn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "flashOn@3x.png"; sourceTree = "<group>"; };
D50BE3E71C9FE7A80000A34C /* info@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "info@3x.png"; sourceTree = "<group>"; };
D5349DF7201E42D900CD53EA /* cameraRotate@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cameraRotate@3x.png"; sourceTree = "<group>"; };
D55281B52016758F00FF3CDD /* HeaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderViewController.swift; sourceTree = "<group>"; };
D55281B7201675D500FF3CDD /* MessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = "<group>"; };
D55281B92016770800FF3CDD /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -56,7 +62,10 @@
D50BE3E31C9FE7A80000A34C /* Images */ = {
isa = PBXGroup;
children = (
CE8C0770252FBBAF007FF4A4 /* Images.xcassets */,
D5349DF7201E42D900CD53EA /* cameraRotate@3x.png */,
D50BE3E51C9FE7A80000A34C /* flashOff@3x.png */,
D50BE3E61C9FE7A80000A34C /* flashOn@3x.png */,
D50BE3E71C9FE7A80000A34C /* info@3x.png */,
);
path = Images;
sourceTree = "<group>";
Expand Down Expand Up @@ -86,6 +95,7 @@
D5B2E8951C3A780C00C0327D = {
isa = PBXGroup;
children = (
D50BE3E31C9FE7A80000A34C /* Images */,
D5C629691C3A809D007F7B7C /* Sources */,
D5C6295C1C3A800E007F7B7C /* BarcodeScanner */,
D5B2E8A01C3A780C00C0327D /* Products */,
Expand All @@ -111,7 +121,6 @@
D5C629691C3A809D007F7B7C /* Sources */ = {
isa = PBXGroup;
children = (
D50BE3E31C9FE7A80000A34C /* Images */,
D5CB3785201947D000B9319D /* Helpers */,
D5CB37842019477900B9319D /* DataStructures */,
D55281BD20167D9F00FF3CDD /* Extensions */,
Expand Down Expand Up @@ -209,7 +218,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CE8C0771252FBBAF007FF4A4 /* Images.xcassets in Resources */,
D50BE3E91C9FE7A80000A34C /* flashOff@3x.png in Resources */,
D5349DF8201E42D900CD53EA /* cameraRotate@3x.png in Resources */,
D50BE3EB1C9FE7A80000A34C /* info@3x.png in Resources */,
D50BE3EA1C9FE7A80000A34C /* flashOn@3x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading