Skip to content
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.

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

Pinch to zoom added #387

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
fec13a4
Pinch to zoom added
sanketns Oct 8, 2024
431db67
lastZoomFactor variable added for Pinchtozoom
sanketns Oct 8, 2024
56ba518
EditScanViewController bartint color change for buttons
sanketns Oct 8, 2024
5016e5c
ReviewViewController barTint color change for buttons
sanketns Oct 8, 2024
d1fffec
EditScanViewController navigationbar hidden false
sanketns Oct 8, 2024
442dad4
EditScanViewController revert
sanketns Oct 8, 2024
d69fac2
EditScanViewController navigationbar hidden false
sanketns Oct 8, 2024
df9b42d
EditScanViewController navigationbar tint color white. cancel was not…
sanketns Oct 8, 2024
59afb64
EditScanViewController - added cancel and save button at bottom
sanketns Oct 8, 2024
0da9016
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
d44ff3d
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
74a0ed3
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
7984be6
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
82b5bf6
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
c4594d5
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
c878401
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
b221782
EditScanViewController - Bottomview tappable adjustments for button c…
sanketns Oct 8, 2024
2dcbea5
EditScanViewController - Left and right alignment for cancel and save
sanketns Oct 8, 2024
99715d5
EditScanViewController - save button action implemented upload
sanketns Oct 8, 2024
24073bc
EditScanViewController - save saving & upload image process
sanketns Oct 8, 2024
7e5e026
EditScanViewController - save saving & upload image process
sanketns Oct 8, 2024
2f81464
EditScanViewController - save saving & upload image process
sanketns Oct 8, 2024
7c8096d
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
cb75c3c
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
fc450c5
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
dc50cea
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
3b64c4b
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
fa74f58
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
c877b60
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
b8b0c07
Roate Image enabled for while moving from ImageScannerController to E…
sanketns Oct 9, 2024
810c178
UIImage extension added
sanketns Oct 9, 2024
a08b7be
UIImage extension removed
sanketns Oct 9, 2024
b3c0631
UIImage extension added correctedimage
sanketns Oct 9, 2024
ff4b38c
UIImage extension added correctedimage
sanketns Oct 9, 2024
b278038
Added crop reset button and managed and rotation related changes
sanketns Oct 11, 2024
63f60ba
Added crop reset button and managede same in ReviewViewController as …
sanketns Oct 11, 2024
e2e02ab
Done button title changed to Save in ReviewViewController
sanketns Oct 11, 2024
e9d6bc9
Save and Next button places exchanged in EditScanViewController
sanketns Oct 11, 2024
3d5578e
Back to home, zoom adjustment and other changes
sanketns Oct 14, 2024
55118dd
Back to home, zoom adjustment and other changes
sanketns Oct 14, 2024
37fc22f
Back to home, zoom adjustment and other changes
sanketns Oct 14, 2024
660f6e4
Back to home, zoom adjustment and other changes
sanketns Oct 14, 2024
5e058c9
Imagescanner delegate didFinish added dismiss boolean value to decide…
sanketns Oct 14, 2024
1f52d30
Imagescanner delegate didFinish added dismiss boolean value to decide…
sanketns Oct 14, 2024
ff92548
Imagescanner delegate didFinish added dismiss boolean value to decide…
sanketns Oct 14, 2024
92e6155
Imagescanner delegate didFinish added dismiss boolean value to decide…
sanketns Oct 14, 2024
85ff85c
Imagescanner delegate didFinish added dismiss boolean value to decide…
sanketns Oct 14, 2024
028e55f
Keep scannig mode open on save
sanketns Oct 14, 2024
39e7ead
ReviewViewController rotate and filter button kept left and save at b…
sanketns Oct 14, 2024
681b1a6
Scanning lagging when phone locked issue resolved
sanketns Oct 15, 2024
68b9e2b
Scanning lagging when lock and unlock
sanketns Oct 15, 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
17 changes: 8 additions & 9 deletions Example/WeScan.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -136,7 +136,6 @@
A1D4BCB6202C4F3800FCDDEC = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1020;
ProvisioningStyle = Manual;
};
};
};
Expand Down Expand Up @@ -207,7 +206,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ -z \"$CI\" ]; then\n if [ \"${CONFIGURATION}\" == \"Debug\" ]; then\n if test -d \"/opt/homebrew/bin/\"; then\n PATH=\"/opt/homebrew/bin/:${PATH}\"\n fi\n\n export PATH\n swiftlint --config \"${SRCROOT}/../Submodules/WeTransfer-iOS-CI/BuildTools/.swiftlint.yml\"\n else\n echo \"Info: As we're not building for Debug, no SwiftLint is running.\"\n fi\nfi\n";
shellScript = "if [[ \"$(uname -m)\" == arm64 ]]\nthen\n export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif command -v swiftlint >/dev/null 2>&1\nthen\n swiftlint\nelse\n echo \"warning: `swiftlint` command not found - See https://github.com/realm/SwiftLint#installation for installation instructions.\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -367,15 +366,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 25NLYN3EQD;
INFOPLIST_FILE = WeScanSampleProject/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.WeTransfer.WeScanSampleProject;
PRODUCT_BUNDLE_IDENTIFIER = com.deepfoods.Test4;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
Expand All @@ -388,15 +387,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 25NLYN3EQD;
INFOPLIST_FILE = WeScanSampleProject/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.WeTransfer.WeScanSampleProject;
PRODUCT_BUNDLE_IDENTIFIER = com.deepfoods.Test4;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "display-frame.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "qr-code.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions Example/WeScanSampleProject/HomeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,18 @@ final class HomeViewController: UIViewController {
}

extension HomeViewController: ImageScannerControllerDelegate {
func imageScannerController(_ scanner: WeScan.ImageScannerController, didFinishScanningWithResults results: WeScan.ImageScannerResults, dismiss: Bool) {
scanner.dismiss(animated: true, completion: nil)
}

func navigateBackToHomeTapped(_ scanner: ImageScannerController) {

}

func imageScannerController(_ scanner: ImageScannerController, didFailWithError error: Error) {
assertionFailure("Error occurred: \(error)")
}

func imageScannerController(_ scanner: ImageScannerController, didFinishScanningWithResults results: ImageScannerResults) {
scanner.dismiss(animated: true, completion: nil)
}

func imageScannerControllerDidCancel(_ scanner: ImageScannerController) {
scanner.dismiss(animated: true, completion: nil)
}
Expand Down
Loading