Skip to content
This repository was archived by the owner on Jun 12, 2019. It is now read-only.

Revert "Added filter screen" #2

Merged
Narek1994 merged 1 commit into from
Oct 28, 2017
Merged

Revert "Added filter screen" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 0 additions & 34 deletions ALCameraViewController.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
B2357AB11FA50D51003F9ACF /* FilterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */; };
B2357AB21FA50D51003F9ACF /* FilterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB01FA50D51003F9ACF /* FilterViewController.swift */; };
B2357AB31FA50E13003F9ACF /* FilterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB01FA50D51003F9ACF /* FilterViewController.swift */; };
B2357AB41FA50E13003F9ACF /* FilterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */; };
B2357AB91FA51156003F9ACF /* UIImageView+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */; };
B2357ABA1FA51156003F9ACF /* UIImage+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB71FA51156003F9ACF /* UIImage+Filter.m */; };
B2357ABB1FA5115C003F9ACF /* UIImage+Filter.h in Headers */ = {isa = PBXBuildFile; fileRef = B2357AB81FA51156003F9ACF /* UIImage+Filter.h */; };
B2357ABC1FA5115C003F9ACF /* UIImage+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB71FA51156003F9ACF /* UIImage+Filter.m */; };
B2357ABD1FA5115C003F9ACF /* UIImageView+Filter.h in Headers */ = {isa = PBXBuildFile; fileRef = B2357AB51FA51155003F9ACF /* UIImageView+Filter.h */; };
B2357ABE1FA5115C003F9ACF /* UIImageView+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */; };
B2357ABF1FA511DC003F9ACF /* CameraViewController-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = E33BE72F1F54955E005842DC /* CameraViewController-Bridging-Header.h */; };
BF5861F31F613FB800B406F6 /* CropViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5861F61F613FB800B406F6 /* CropViewController.xib */; };
BF5861F41F613FB800B406F6 /* CropViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5861F61F613FB800B406F6 /* CropViewController.xib */; };
BF5861F81F61404C00B406F6 /* ConfirmViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5861FB1F61404C00B406F6 /* ConfirmViewController.xib */; };
Expand Down Expand Up @@ -85,12 +74,6 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterViewController.xib; sourceTree = "<group>"; };
B2357AB01FA50D51003F9ACF /* FilterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterViewController.swift; sourceTree = "<group>"; };
B2357AB51FA51155003F9ACF /* UIImageView+Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+Filter.h"; sourceTree = "<group>"; };
B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+Filter.m"; sourceTree = "<group>"; };
B2357AB71FA51156003F9ACF /* UIImage+Filter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Filter.m"; sourceTree = "<group>"; };
B2357AB81FA51156003F9ACF /* UIImage+Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Filter.h"; sourceTree = "<group>"; };
BF5862001F625D0F00B406F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/CameraView.strings; sourceTree = "<group>"; };
BF5862021F625D1200B406F6 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/CameraView.strings"; sourceTree = "<group>"; };
C40665431C73A47C00EB9751 /* SingleImageSaver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleImageSaver.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -174,8 +157,6 @@
E3669CC41F96848D00CCDD01 /* CameraViewController.xib */,
FA7E6B9A1B429012000E1B14 /* CropViewController.swift */,
BF5861F61F613FB800B406F6 /* CropViewController.xib */,
B2357AB01FA50D51003F9ACF /* FilterViewController.swift */,
B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */,
E35A240E1F50B49A001047FD /* ConfirmViewController.swift */,
BF5861FB1F61404C00B406F6 /* ConfirmViewController.xib */,
);
Expand All @@ -199,10 +180,6 @@
children = (
E33BE71B1F5134C1005842DC /* CIImage+Utilities.m */,
E33BE71C1F5134C1005842DC /* CIImage+Utilities.h */,
B2357AB81FA51156003F9ACF /* UIImage+Filter.h */,
B2357AB71FA51156003F9ACF /* UIImage+Filter.m */,
B2357AB51FA51155003F9ACF /* UIImageView+Filter.h */,
B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */,
FAB50BF01B413E8C009905B9 /* ImageFetcher.swift */,
C40665431C73A47C00EB9751 /* SingleImageSaver.swift */,
C40665471C73B72D00EB9751 /* SingleImageFetcher.swift */,
Expand Down Expand Up @@ -280,12 +257,9 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
B2357ABB1FA5115C003F9ACF /* UIImage+Filter.h in Headers */,
E33BE7271F546920005842DC /* IRLRectangleFeature+Extensions.h in Headers */,
E33BE71F1F5134C1005842DC /* CIImage+Utilities.h in Headers */,
B2357ABF1FA511DC003F9ACF /* CameraViewController-Bridging-Header.h in Headers */,
E33BE72E1F5494EC005842DC /* CameraViewController.h in Headers */,
B2357ABD1FA5115C003F9ACF /* UIImageView+Filter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -379,7 +353,6 @@
E3669CC21F96848D00CCDD01 /* CameraViewController.xib in Resources */,
BF5861F91F61404C00B406F6 /* ConfirmViewController.xib in Resources */,
C482A0151CAEB1B100541D08 /* CameraViewAssets.xcassets in Resources */,
B2357AB41FA50E13003F9ACF /* FilterViewController.xib in Resources */,
BF5861F41F613FB800B406F6 /* CropViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -395,7 +368,6 @@
FAF0584C1B31618D008E5592 /* Images.xcassets in Resources */,
FA778A411B8319D8005807E7 /* image.jpg in Resources */,
BF5861F31F613FB800B406F6 /* CropViewController.xib in Resources */,
B2357AB11FA50D51003F9ACF /* FilterViewController.xib in Resources */,
BF5861F81F61404C00B406F6 /* ConfirmViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -418,18 +390,15 @@
E35A240A1F509FBD001047FD /* CGRectExtensions.swift in Sources */,
E33BE7291F546920005842DC /* IRLRectangleFeature+Extensions.m in Sources */,
C482A0081CAEB18D00541D08 /* CameraGlobals.swift in Sources */,
B2357ABC1FA5115C003F9ACF /* UIImage+Filter.m in Sources */,
C482A0091CAEB18D00541D08 /* VolumeControl.swift in Sources */,
C482A00A1CAEB18D00541D08 /* PhotoLibraryAuthorizer.swift in Sources */,
E35A24071F509CDC001047FD /* OverlayView.swift in Sources */,
E35A24101F50B49A001047FD /* ConfirmViewController.swift in Sources */,
C482A00B1CAEB18D00541D08 /* UIButtonExtensions.swift in Sources */,
C482A00C1CAEB18D00541D08 /* PhotoLibraryViewController.swift in Sources */,
C482A00D1CAEB18D00541D08 /* CameraViewController.swift in Sources */,
B2357AB31FA50E13003F9ACF /* FilterViewController.swift in Sources */,
C482A00E1CAEB18D00541D08 /* CropViewController.swift in Sources */,
C482A00F1CAEB18D00541D08 /* ImageCell.swift in Sources */,
B2357ABE1FA5115C003F9ACF /* UIImageView+Filter.m in Sources */,
C482A0101CAEB18D00541D08 /* PermissionsView.swift in Sources */,
C482A0111CAEB18D00541D08 /* CameraView.swift in Sources */,
C482A0121CAEB18D00541D08 /* CropOverlay.swift in Sources */,
Expand All @@ -445,12 +414,10 @@
E35A240F1F50B49A001047FD /* ConfirmViewController.swift in Sources */,
FA5FA3431B3AFA2B00497C62 /* PermissionsView.swift in Sources */,
FAB50BFC1B413E8C009905B9 /* ImageFetcher.swift in Sources */,
B2357ABA1FA51156003F9ACF /* UIImage+Filter.m in Sources */,
E35A24091F509FBD001047FD /* CGRectExtensions.swift in Sources */,
FA82313A1B3C296C00A837BE /* Utilities.swift in Sources */,
FAB50C001B413E8C009905B9 /* PhotoLibraryViewController.swift in Sources */,
E33BE7281F546920005842DC /* IRLRectangleFeature+Extensions.m in Sources */,
B2357AB91FA51156003F9ACF /* UIImageView+Filter.m in Sources */,
FAF0586A1B317894008E5592 /* CameraShot.swift in Sources */,
E35A240C1F509FFC001047FD /* CGPointExtensions.swift in Sources */,
FAF058661B316695008E5592 /* CameraViewController.swift in Sources */,
Expand All @@ -462,7 +429,6 @@
FAF058471B31618D008E5592 /* ViewController.swift in Sources */,
FAF058681B3175C5008E5592 /* CameraView.swift in Sources */,
C4D9BA471CA73163004F70F7 /* UIButtonExtensions.swift in Sources */,
B2357AB21FA50D51003F9ACF /* FilterViewController.swift in Sources */,
C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */,
FAF058451B31618D008E5592 /* AppDelegate.swift in Sources */,
C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */,
Expand Down
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Line.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...ViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/bwFilterHighlight.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/bwFilterNormal.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...ntroller/CameraViewAssets.xcassets/colorFilterHighlight.imageset/colorFilterHighlight.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...ViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/colorFilterNormal.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ...raViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...er/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/exposureFilterHighlight.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...ntroller/CameraViewAssets.xcassets/exposureFilterNormal.imageset/exposureFilterNormal.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...Controller/CameraViewAssets.xcassets/grayFilterHighlight.imageset/grayFilterHighlight.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...raViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/grayFilterNormal.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ...raViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...er/CameraViewAssets.xcassets/originalFilterHighlight.imageset/originalFilterHighlight.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...ntroller/CameraViewAssets.xcassets/originalFilterNormal.imageset/originalFilterNormal.pdf
View file
Open in desktop
Binary file not shown.
45 changes: 0 additions & 45 deletions ALCameraViewController/Utilities/UIImage+Filter.h
View file
Open in desktop

This file was deleted.

Loading