From f08035c6d28b9b48c5b31816142c1a4638918082 Mon Sep 17 00:00:00 2001 From: morgan smith Date: Thu, 3 Sep 2020 11:41:40 -0400 Subject: [PATCH 1/3] created/finished ImageFilterEditor --- .../project.pbxproj | 389 +++++++++++ .../ImageFilterEditor/AppDelegate.swift | 37 ++ .../AppIcon.appiconset/Contents.json | 98 +++ .../Assets.xcassets/Contents.json | 6 + .../Base.lproj/LaunchScreen.storyboard | 25 + .../Base.lproj/Main.storyboard | 628 ++++++++++++++++++ .../BlurViewController.swift | 107 +++ .../ColorInvertViewController.swift | 89 +++ .../ColorViewController.swift | 115 ++++ .../DistortionViewController.swift | 116 ++++ .../SharpenViewController.swift | 93 +++ .../Helper/Image+Ratio.swift | 16 + .../Helper/UIImage+Scaling.swift | 38 ++ .../UIViewController+InformationalAlert.swift | 22 + .../ImagePostViewController.swift | 132 ++++ .../ImageFilterEditor/Info.plist | 68 ++ .../ImageFilterEditor/SceneDelegate.swift | 53 ++ .../ImagePostViewController.swift | 2 +- 18 files changed, 2033 insertions(+), 1 deletion(-) create mode 100644 ImageFilterEditor/ImageFilterEditor.xcodeproj/project.pbxproj create mode 100644 ImageFilterEditor/ImageFilterEditor/AppDelegate.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ImageFilterEditor/ImageFilterEditor/Assets.xcassets/Contents.json create mode 100644 ImageFilterEditor/ImageFilterEditor/Base.lproj/LaunchScreen.storyboard create mode 100644 ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard create mode 100644 ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorInvertViewController.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorViewController.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Filter View Controllers/DistortionViewController.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Filter View Controllers/SharpenViewController.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Helper/Image+Ratio.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Helper/UIImage+Scaling.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Helper/UIViewController+InformationalAlert.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/ImagePostViewController.swift create mode 100644 ImageFilterEditor/ImageFilterEditor/Info.plist create mode 100644 ImageFilterEditor/ImageFilterEditor/SceneDelegate.swift diff --git a/ImageFilterEditor/ImageFilterEditor.xcodeproj/project.pbxproj b/ImageFilterEditor/ImageFilterEditor.xcodeproj/project.pbxproj new file mode 100644 index 00000000..bcf11861 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor.xcodeproj/project.pbxproj @@ -0,0 +1,389 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 02C7B54A2500114200C4A310 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B5492500114200C4A310 /* AppDelegate.swift */; }; + 02C7B54C2500114200C4A310 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B54B2500114200C4A310 /* SceneDelegate.swift */; }; + 02C7B5512500114200C4A310 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 02C7B54F2500114200C4A310 /* Main.storyboard */; }; + 02C7B5532500114A00C4A310 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02C7B5522500114A00C4A310 /* Assets.xcassets */; }; + 02C7B5562500114A00C4A310 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 02C7B5542500114A00C4A310 /* LaunchScreen.storyboard */; }; + 02C7B55E2500132300C4A310 /* ImagePostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B55D2500132300C4A310 /* ImagePostViewController.swift */; }; + 02C7B56025001AF000C4A310 /* UIImage+Scaling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B55F25001AF000C4A310 /* UIImage+Scaling.swift */; }; + 02C7B56225001CD900C4A310 /* Image+Ratio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B56125001CD900C4A310 /* Image+Ratio.swift */; }; + 02C7B56425001DDB00C4A310 /* UIViewController+InformationalAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B56325001DDB00C4A310 /* UIViewController+InformationalAlert.swift */; }; + 02C7B56625001E4300C4A310 /* BlurViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B56525001E4300C4A310 /* BlurViewController.swift */; }; + 02C7B56A25001E9E00C4A310 /* ColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B56925001E9E00C4A310 /* ColorViewController.swift */; }; + 02C7B56C25001EBE00C4A310 /* DistortionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B56B25001EBE00C4A310 /* DistortionViewController.swift */; }; + 02C7B57025001EE600C4A310 /* SharpenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B56F25001EE600C4A310 /* SharpenViewController.swift */; }; + 02C7B572250140EB00C4A310 /* ColorInvertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B571250140EB00C4A310 /* ColorInvertViewController.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 02C7B5462500114200C4A310 /* ImageFilterEditor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ImageFilterEditor.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 02C7B5492500114200C4A310 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 02C7B54B2500114200C4A310 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 02C7B5502500114200C4A310 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 02C7B5522500114A00C4A310 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 02C7B5552500114A00C4A310 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 02C7B5572500114A00C4A310 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 02C7B55D2500132300C4A310 /* ImagePostViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePostViewController.swift; sourceTree = ""; }; + 02C7B55F25001AF000C4A310 /* UIImage+Scaling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Scaling.swift"; sourceTree = ""; }; + 02C7B56125001CD900C4A310 /* Image+Ratio.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Image+Ratio.swift"; sourceTree = ""; }; + 02C7B56325001DDB00C4A310 /* UIViewController+InformationalAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+InformationalAlert.swift"; sourceTree = ""; }; + 02C7B56525001E4300C4A310 /* BlurViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurViewController.swift; sourceTree = ""; }; + 02C7B56925001E9E00C4A310 /* ColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewController.swift; sourceTree = ""; }; + 02C7B56B25001EBE00C4A310 /* DistortionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DistortionViewController.swift; sourceTree = ""; }; + 02C7B56F25001EE600C4A310 /* SharpenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharpenViewController.swift; sourceTree = ""; }; + 02C7B571250140EB00C4A310 /* ColorInvertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorInvertViewController.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 02C7B5432500114200C4A310 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 02C7B53D2500114200C4A310 = { + isa = PBXGroup; + children = ( + 02C7B5482500114200C4A310 /* ImageFilterEditor */, + 02C7B5472500114200C4A310 /* Products */, + ); + sourceTree = ""; + }; + 02C7B5472500114200C4A310 /* Products */ = { + isa = PBXGroup; + children = ( + 02C7B5462500114200C4A310 /* ImageFilterEditor.app */, + ); + name = Products; + sourceTree = ""; + }; + 02C7B5482500114200C4A310 /* ImageFilterEditor */ = { + isa = PBXGroup; + children = ( + 02C7B55D2500132300C4A310 /* ImagePostViewController.swift */, + 02C7B56825001E5A00C4A310 /* Filter View Controllers */, + 02C7B56725001E4B00C4A310 /* Helper */, + 02C7B5492500114200C4A310 /* AppDelegate.swift */, + 02C7B54B2500114200C4A310 /* SceneDelegate.swift */, + 02C7B54F2500114200C4A310 /* Main.storyboard */, + 02C7B5522500114A00C4A310 /* Assets.xcassets */, + 02C7B5542500114A00C4A310 /* LaunchScreen.storyboard */, + 02C7B5572500114A00C4A310 /* Info.plist */, + ); + path = ImageFilterEditor; + sourceTree = ""; + }; + 02C7B56725001E4B00C4A310 /* Helper */ = { + isa = PBXGroup; + children = ( + 02C7B55F25001AF000C4A310 /* UIImage+Scaling.swift */, + 02C7B56125001CD900C4A310 /* Image+Ratio.swift */, + 02C7B56325001DDB00C4A310 /* UIViewController+InformationalAlert.swift */, + ); + path = Helper; + sourceTree = ""; + }; + 02C7B56825001E5A00C4A310 /* Filter View Controllers */ = { + isa = PBXGroup; + children = ( + 02C7B56525001E4300C4A310 /* BlurViewController.swift */, + 02C7B56925001E9E00C4A310 /* ColorViewController.swift */, + 02C7B56B25001EBE00C4A310 /* DistortionViewController.swift */, + 02C7B56F25001EE600C4A310 /* SharpenViewController.swift */, + 02C7B571250140EB00C4A310 /* ColorInvertViewController.swift */, + ); + path = "Filter View Controllers"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 02C7B5452500114200C4A310 /* ImageFilterEditor */ = { + isa = PBXNativeTarget; + buildConfigurationList = 02C7B55A2500114A00C4A310 /* Build configuration list for PBXNativeTarget "ImageFilterEditor" */; + buildPhases = ( + 02C7B5422500114200C4A310 /* Sources */, + 02C7B5432500114200C4A310 /* Frameworks */, + 02C7B5442500114200C4A310 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = ImageFilterEditor; + productName = ImageFilterEditor; + productReference = 02C7B5462500114200C4A310 /* ImageFilterEditor.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 02C7B53E2500114200C4A310 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1150; + LastUpgradeCheck = 1150; + ORGANIZATIONNAME = "Morgan Smith"; + TargetAttributes = { + 02C7B5452500114200C4A310 = { + CreatedOnToolsVersion = 11.5; + }; + }; + }; + buildConfigurationList = 02C7B5412500114200C4A310 /* Build configuration list for PBXProject "ImageFilterEditor" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 02C7B53D2500114200C4A310; + productRefGroup = 02C7B5472500114200C4A310 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 02C7B5452500114200C4A310 /* ImageFilterEditor */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 02C7B5442500114200C4A310 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 02C7B5562500114A00C4A310 /* LaunchScreen.storyboard in Resources */, + 02C7B5532500114A00C4A310 /* Assets.xcassets in Resources */, + 02C7B5512500114200C4A310 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 02C7B5422500114200C4A310 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 02C7B56625001E4300C4A310 /* BlurViewController.swift in Sources */, + 02C7B572250140EB00C4A310 /* ColorInvertViewController.swift in Sources */, + 02C7B54A2500114200C4A310 /* AppDelegate.swift in Sources */, + 02C7B56A25001E9E00C4A310 /* ColorViewController.swift in Sources */, + 02C7B56025001AF000C4A310 /* UIImage+Scaling.swift in Sources */, + 02C7B55E2500132300C4A310 /* ImagePostViewController.swift in Sources */, + 02C7B56C25001EBE00C4A310 /* DistortionViewController.swift in Sources */, + 02C7B54C2500114200C4A310 /* SceneDelegate.swift in Sources */, + 02C7B57025001EE600C4A310 /* SharpenViewController.swift in Sources */, + 02C7B56225001CD900C4A310 /* Image+Ratio.swift in Sources */, + 02C7B56425001DDB00C4A310 /* UIViewController+InformationalAlert.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 02C7B54F2500114200C4A310 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 02C7B5502500114200C4A310 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 02C7B5542500114A00C4A310 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 02C7B5552500114A00C4A310 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 02C7B5582500114A00C4A310 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.5; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 02C7B5592500114A00C4A310 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.5; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 02C7B55B2500114A00C4A310 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = ImageFilterEditor/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.morgansmith.ImageFilterEditor; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 02C7B55C2500114A00C4A310 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = ImageFilterEditor/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.morgansmith.ImageFilterEditor; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 02C7B5412500114200C4A310 /* Build configuration list for PBXProject "ImageFilterEditor" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 02C7B5582500114A00C4A310 /* Debug */, + 02C7B5592500114A00C4A310 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 02C7B55A2500114A00C4A310 /* Build configuration list for PBXNativeTarget "ImageFilterEditor" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 02C7B55B2500114A00C4A310 /* Debug */, + 02C7B55C2500114A00C4A310 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 02C7B53E2500114200C4A310 /* Project object */; +} diff --git a/ImageFilterEditor/ImageFilterEditor/AppDelegate.swift b/ImageFilterEditor/ImageFilterEditor/AppDelegate.swift new file mode 100644 index 00000000..e47fb9bc --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/AppDelegate.swift @@ -0,0 +1,37 @@ +// +// AppDelegate.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/ImageFilterEditor/ImageFilterEditor/Assets.xcassets/AppIcon.appiconset/Contents.json b/ImageFilterEditor/ImageFilterEditor/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..9221b9bb --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ImageFilterEditor/ImageFilterEditor/Assets.xcassets/Contents.json b/ImageFilterEditor/ImageFilterEditor/Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ImageFilterEditor/ImageFilterEditor/Base.lproj/LaunchScreen.storyboard b/ImageFilterEditor/ImageFilterEditor/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..865e9329 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard b/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard new file mode 100644 index 00000000..5dd4b030 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard @@ -0,0 +1,628 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift new file mode 100644 index 00000000..7836f65f --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift @@ -0,0 +1,107 @@ +// +// BlurViewController.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +import CoreImage.CIFilterBuiltins + +class BlurViewController: UIViewController { + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var blurSlider: UISlider! + + private let context = CIContext(options: nil) + let filter = CIFilter(name: "CIGaussianBlur")! + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + setUpBlurSlider() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + + @IBAction func blurChanged(_ sender: UISlider) { + updateImage() + } + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(blurSlider.value, forKey: "inputRadius") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + func setUpBlurSlider() { + if let inputRadiusDictionary = filter.attributes["inputRadius"] as? [String: Any], + let sliderMin = inputRadiusDictionary[kCIAttributeSliderMin] as? Float, + let sliderMax = inputRadiusDictionary[kCIAttributeSliderMax] as? Float, + let identity = inputRadiusDictionary[kCIAttributeIdentity] as? Float { + + blurSlider.minimumValue = sliderMin + blurSlider.maximumValue = sliderMax + blurSlider.value = identity + } + } + + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveBlur" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + } + } + } + +} diff --git a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorInvertViewController.swift b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorInvertViewController.swift new file mode 100644 index 00000000..6549e1ed --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorInvertViewController.swift @@ -0,0 +1,89 @@ +// +// ColorInvertViewController.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +import CoreImage.CIFilterBuiltins + +class ColorInvertViewController: UIViewController { + @IBOutlet weak var imageView: UIImageView! + private let context = CIContext(options: nil) + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + @IBAction func invertTapped(_ sender: Any) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let filter = CIFilter(name: "CIColorInvert")! + filter.setValue(ciImage, forKey: "inputImage") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveColorInvert" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + } + } + } + + } + diff --git a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorViewController.swift b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorViewController.swift new file mode 100644 index 00000000..f986e867 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/ColorViewController.swift @@ -0,0 +1,115 @@ +// +// ColorViewController.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +import CoreImage.CIFilterBuiltins + +class ColorViewController: UIViewController { + + @IBOutlet weak var brightnessSlider: UISlider! + @IBOutlet weak var contrastSlider: UISlider! + @IBOutlet weak var saturationSlider: UISlider! + @IBOutlet weak var imageView: UIImageView! + + private let context = CIContext(options: nil) + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func brightnessChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func contrastChanged(_ sender: Any) { + updateImage() + } + + @IBAction func saturationChanged(_ sender: Any) { + updateImage() + } + + + @IBAction func cancelTapped(_ sender: Any) { + navigationController?.popViewController(animated: true) + } + + @IBAction func saveTapped(_ sender: Any) { + + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + + let filter = CIFilter(name: "CIColorControls")! + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(saturationSlider.value, forKey: "inputSaturation") + filter.setValue(brightnessSlider.value, forKey: "inputBrightness") + filter.setValue(contrastSlider.value, forKey: "inputContrast") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + + + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveColor" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + } + } + } + + +} diff --git a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/DistortionViewController.swift b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/DistortionViewController.swift new file mode 100644 index 00000000..d7c42cfc --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/DistortionViewController.swift @@ -0,0 +1,116 @@ +// +// DistortionViewController.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +import CoreImage.CIFilterBuiltins + +class DistortionViewController: UIViewController { + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var radiusSlider: UISlider! + @IBOutlet weak var angleSlider: UISlider! + @IBOutlet weak var xCenterSlider: UISlider! + @IBOutlet weak var yCenterSlider: UISlider! + + + private let context = CIContext(options: nil) + let filter = CIFilter(name: "CIVortexDistortion")! + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + + @IBAction func radiusChanged(_ sender: UISlider) { + updateImage() + } + @IBAction func angleChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func xCenterChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func yCenterChanged(_ sender: UISlider) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let center = CIVector(x: CGFloat(xCenterSlider.value), y: CGFloat(yCenterSlider.value)) + + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(radiusSlider.value, forKey: "inputRadius") + filter.setValue(angleSlider.value, forKey: "inputAngle") + filter.setValue(center, forKey: "inputCenter") + + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveDistortion" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + } + } + } + +} + diff --git a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/SharpenViewController.swift b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/SharpenViewController.swift new file mode 100644 index 00000000..5e546846 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/SharpenViewController.swift @@ -0,0 +1,93 @@ +// +// SharpenViewController.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +import CoreImage.CIFilterBuiltins + +class SharpenViewController: UIViewController { + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var sharpenSlider: UISlider! + + private let context = CIContext(options: nil) + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + @IBAction func sharpenTapped(_ sender: Any) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let filter = CIFilter(name: "CISharpenLuminance")! + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(sharpenSlider.value, forKey: "inputSharpness") + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveSharpen" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + } + } + } + +} + + diff --git a/ImageFilterEditor/ImageFilterEditor/Helper/Image+Ratio.swift b/ImageFilterEditor/ImageFilterEditor/Helper/Image+Ratio.swift new file mode 100644 index 00000000..a80e2b92 --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Helper/Image+Ratio.swift @@ -0,0 +1,16 @@ +// +// Image+Ratio.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + + +import UIKit + +extension UIImage { + var ratio: CGFloat { + return size.height / size.width + } +} diff --git a/ImageFilterEditor/ImageFilterEditor/Helper/UIImage+Scaling.swift b/ImageFilterEditor/ImageFilterEditor/Helper/UIImage+Scaling.swift new file mode 100644 index 00000000..d60f0c4a --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Helper/UIImage+Scaling.swift @@ -0,0 +1,38 @@ +// +// UIImage+Scaling.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// +import UIKit + +extension UIImage { + + /// Resize the image to a max dimension from size parameter + func imageByScaling(toSize size: CGSize) -> UIImage? { + guard size.width > 0 && size.height > 0 else { return nil } + + let originalAspectRatio = self.size.width/self.size.height + var correctedSize = size + + if correctedSize.width > correctedSize.width*originalAspectRatio { + correctedSize.width = correctedSize.width*originalAspectRatio + } else { + correctedSize.height = correctedSize.height/originalAspectRatio + } + + return UIGraphicsImageRenderer(size: correctedSize, format: imageRendererFormat).image { context in + draw(in: CGRect(origin: .zero, size: correctedSize)) + } + } + + /// Renders the image if the pixel data was rotated due to orientation of camera + var flattened: UIImage { + if imageOrientation == .up { return self } + return UIGraphicsImageRenderer(size: size, format: imageRendererFormat).image { context in + draw(at: .zero) + } + } +} + diff --git a/ImageFilterEditor/ImageFilterEditor/Helper/UIViewController+InformationalAlert.swift b/ImageFilterEditor/ImageFilterEditor/Helper/UIViewController+InformationalAlert.swift new file mode 100644 index 00000000..f39803cf --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Helper/UIViewController+InformationalAlert.swift @@ -0,0 +1,22 @@ +// +// UIViewController+InformationalAlert.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit + +extension UIViewController { + + func presentInformationalAlertController(title: String?, message: String?, dismissActionCompletion: ((UIAlertAction) -> Void)? = nil, completion: (() -> Void)? = nil) { + let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert) + let dismissAction = UIAlertAction(title: "Dismiss", style: .cancel, handler: dismissActionCompletion) + + alertController.addAction(dismissAction) + + present(alertController, animated: true, completion: completion) + } +} + diff --git a/ImageFilterEditor/ImageFilterEditor/ImagePostViewController.swift b/ImageFilterEditor/ImageFilterEditor/ImagePostViewController.swift new file mode 100644 index 00000000..383bc73d --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/ImagePostViewController.swift @@ -0,0 +1,132 @@ +// +// ImagePostViewController.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +import CoreImage.CIFilterBuiltins + +class ImagePostViewController: UIViewController { + + var imageData: Data? + var filteredImage: UIImage? + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var titleTextField: UITextField! + @IBOutlet weak var chooseImageButton: UIBarButtonItem! + @IBOutlet weak var imageHeightConstraint: NSLayoutConstraint! + @IBOutlet weak var postButton: UIBarButtonItem! + + static var sharedPhoto = UIImage() + + override func viewDidLoad() { + super.viewDidLoad() + if let filtered = filteredImage { + imageView.image = filtered + } else { + updateViews() + } + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(true) + if let filtered = filteredImage { + imageView.image = filtered + } else { + updateViews() + } + } + + func updateViews() { + guard let imageData = imageData, + let image = UIImage(data: imageData) else { + title = "New Post" + return + } + title = "New Title" + imageView.image = image + } + + + @IBAction func filterPhoto(_ sender: Any) { + ImagePostViewController.sharedPhoto = imageView.image ?? UIImage(systemName: "photo")! + } + + + @IBAction func chooseImage(_ sender: Any) { + + let authorizationStatus = PHPhotoLibrary.authorizationStatus() + + switch authorizationStatus { + case .authorized: + presentImagePickerController() + case .notDetermined: + + PHPhotoLibrary.requestAuthorization { (status) in + + guard status == .authorized else { + NSLog("User did not authorize access to the photo library") + self.presentInformationalAlertController(title: "Error", message: "In order to access the photo library, you must allow this application access to it.") + return + } + + self.presentImagePickerController() + } + + case .denied: + self.presentInformationalAlertController(title: "Error", message: "In order to access the photo library, you must allow this application access to it.") + case .restricted: + self.presentInformationalAlertController(title: "Error", message: "Unable to access the photo library. Your device's restrictions do not allow access.") + + @unknown default: + print("FatalError") + } + presentImagePickerController() + + } + + private func presentImagePickerController() { + + guard UIImagePickerController.isSourceTypeAvailable(.photoLibrary) else { + presentInformationalAlertController(title: "Error", message: "The photo library is unavailable") + return + } + + let imagePicker = UIImagePickerController() + + imagePicker.delegate = self + + imagePicker.sourceType = .photoLibrary + + present(imagePicker, animated: true, completion: nil) + } + + + + // MARK: - Navigation + +} + +extension ImagePostViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate { + + func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) { + + + picker.dismiss(animated: true, completion: nil) + + guard let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage else { return } + + imageView.image = image + + } + + func imagePickerControllerDidCancel(_ picker: UIImagePickerController) { + picker.dismiss(animated: true, completion: nil) + } +} + diff --git a/ImageFilterEditor/ImageFilterEditor/Info.plist b/ImageFilterEditor/ImageFilterEditor/Info.plist new file mode 100644 index 00000000..491ec2ac --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/Info.plist @@ -0,0 +1,68 @@ + + + + + NSPhotoLibraryUsageDescription + User can filter photos + NSPhotoLibraryAddUsageDescription + User can add photos + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/ImageFilterEditor/ImageFilterEditor/SceneDelegate.swift b/ImageFilterEditor/ImageFilterEditor/SceneDelegate.swift new file mode 100644 index 00000000..87746ffc --- /dev/null +++ b/ImageFilterEditor/ImageFilterEditor/SceneDelegate.swift @@ -0,0 +1,53 @@ +// +// SceneDelegate.swift +// ImageFilterEditor +// +// Created by Morgan Smith on 9/2/20. +// Copyright © 2020 Morgan Smith. All rights reserved. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/LambdaTimeline/View Controllers/ImagePostViewController.swift b/LambdaTimeline/View Controllers/ImagePostViewController.swift index 93c4b93e..fea207c2 100644 --- a/LambdaTimeline/View Controllers/ImagePostViewController.swift +++ b/LambdaTimeline/View Controllers/ImagePostViewController.swift @@ -105,8 +105,8 @@ class ImagePostViewController: ShiftableViewController { print("FatalError") } presentImagePickerController() + } - func setImageViewHeight(with aspectRatio: CGFloat) { imageHeightConstraint.constant = imageView.frame.size.width * aspectRatio From 44d269605f92f2680d4d77373ede6a85bb99bb92 Mon Sep 17 00:00:00 2001 From: morgan smith Date: Thu, 3 Sep 2020 19:05:41 -0400 Subject: [PATCH 2/3] finished integrating everything except the posting, issue with filtered data --- .../Base.lproj/Main.storyboard | 22 +- .../BlurViewController.swift | 2 +- LambdaTimeline.xcodeproj/project.pbxproj | 44 +- .../BlurViewController.swift | 110 ++++ .../ColorInvertViewController.swift | 89 +++ .../ColorViewController.swift | 112 ++++ .../DistortionViewController.swift | 114 ++++ .../SharpenViewController.swift | 93 +++ LambdaTimeline/GoogleService-Info.plist | 36 ++ .../Helpers/Extensions/UIImage+Scaling.swift | 40 ++ LambdaTimeline/Resources/Info.plist | 2 +- .../Storyboards/Base.lproj/Main.storyboard | 543 +++++++++++++++++- .../ImagePostViewController.swift | 65 ++- Podfile.lock | 2 +- 14 files changed, 1232 insertions(+), 42 deletions(-) create mode 100644 LambdaTimeline/Filter View Controllers/BlurViewController.swift create mode 100644 LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift create mode 100644 LambdaTimeline/Filter View Controllers/ColorViewController.swift create mode 100644 LambdaTimeline/Filter View Controllers/DistortionViewController.swift create mode 100644 LambdaTimeline/Filter View Controllers/SharpenViewController.swift create mode 100644 LambdaTimeline/GoogleService-Info.plist create mode 100644 LambdaTimeline/Helpers/Extensions/UIImage+Scaling.swift diff --git a/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard b/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard index 5dd4b030..070abde0 100644 --- a/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard +++ b/ImageFilterEditor/ImageFilterEditor/Base.lproj/Main.storyboard @@ -404,16 +404,16 @@ - + - + @@ -422,7 +422,7 @@ - + @@ -559,16 +559,16 @@ - + - + @@ -578,7 +578,7 @@ - + @@ -620,7 +620,7 @@ - + diff --git a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift index 7836f65f..0fc5c4e7 100644 --- a/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift +++ b/ImageFilterEditor/ImageFilterEditor/Filter View Controllers/BlurViewController.swift @@ -99,7 +99,7 @@ class BlurViewController: UIViewController { override func prepare(for segue: UIStoryboardSegue, sender: Any?) { if segue.identifier == "saveBlur" { if let imageVC = segue.destination as? ImagePostViewController { - imageVC.filteredImage = imageView.image + imageVC.filteredImage = imageView.image } } } diff --git a/LambdaTimeline.xcodeproj/project.pbxproj b/LambdaTimeline.xcodeproj/project.pbxproj index 95ea1e3d..0b2cee38 100644 --- a/LambdaTimeline.xcodeproj/project.pbxproj +++ b/LambdaTimeline.xcodeproj/project.pbxproj @@ -7,6 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 02C7B57625015DCC00C4A310 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 02C7B57525015DCC00C4A310 /* GoogleService-Info.plist */; }; + 02C7B579250184C400C4A310 /* BlurViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B578250184C300C4A310 /* BlurViewController.swift */; }; + 02C7B57B250184E200C4A310 /* ColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B57A250184E200C4A310 /* ColorViewController.swift */; }; + 02C7B57D250184F500C4A310 /* DistortionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B57C250184F500C4A310 /* DistortionViewController.swift */; }; + 02C7B57F2501850200C4A310 /* SharpenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B57E2501850200C4A310 /* SharpenViewController.swift */; }; + 02C7B5812501850F00C4A310 /* ColorInvertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B5802501850F00C4A310 /* ColorInvertViewController.swift */; }; + 02C7B5832501857600C4A310 /* UIImage+Scaling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B5822501857600C4A310 /* UIImage+Scaling.swift */; }; 4646377C216FDE4B00E7FF73 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4646377B216FDE4B00E7FF73 /* AppDelegate.swift */; }; 46463781216FDE4B00E7FF73 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4646377F216FDE4B00E7FF73 /* Main.storyboard */; }; 46463783216FDE4C00E7FF73 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46463782216FDE4C00E7FF73 /* Assets.xcassets */; }; @@ -33,6 +40,13 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 02C7B57525015DCC00C4A310 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + 02C7B578250184C300C4A310 /* BlurViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurViewController.swift; sourceTree = ""; }; + 02C7B57A250184E200C4A310 /* ColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewController.swift; sourceTree = ""; }; + 02C7B57C250184F500C4A310 /* DistortionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DistortionViewController.swift; sourceTree = ""; }; + 02C7B57E2501850200C4A310 /* SharpenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharpenViewController.swift; sourceTree = ""; }; + 02C7B5802501850F00C4A310 /* ColorInvertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorInvertViewController.swift; sourceTree = ""; }; + 02C7B5822501857600C4A310 /* UIImage+Scaling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Scaling.swift"; sourceTree = ""; }; 33A2B89DE9E21538434BD640 /* Pods-LambdaTimeline.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LambdaTimeline.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LambdaTimeline/Pods-LambdaTimeline.debug.xcconfig"; sourceTree = ""; }; 46463778216FDE4B00E7FF73 /* LambdaTimeline.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LambdaTimeline.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4646377B216FDE4B00E7FF73 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -74,6 +88,18 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 02C7B5772501849800C4A310 /* Filter View Controllers */ = { + isa = PBXGroup; + children = ( + 02C7B578250184C300C4A310 /* BlurViewController.swift */, + 02C7B57A250184E200C4A310 /* ColorViewController.swift */, + 02C7B57C250184F500C4A310 /* DistortionViewController.swift */, + 02C7B57E2501850200C4A310 /* SharpenViewController.swift */, + 02C7B5802501850F00C4A310 /* ColorInvertViewController.swift */, + ); + path = "Filter View Controllers"; + sourceTree = ""; + }; 2B7D7DE8669C7C706445FCCC /* Pods */ = { isa = PBXGroup; children = ( @@ -104,6 +130,8 @@ 4646377A216FDE4B00E7FF73 /* LambdaTimeline */ = { isa = PBXGroup; children = ( + 02C7B57525015DCC00C4A310 /* GoogleService-Info.plist */, + 02C7B5772501849800C4A310 /* Filter View Controllers */, 46CFE7042171572900E7FF73 /* Views */, 46A0366B21700F6100E7FF73 /* View Controllers */, 4646379A2170090900E7FF73 /* Model Controllers */, @@ -199,6 +227,7 @@ 46CFE6F22170757F00E7FF73 /* User+DictionaryRepresentation.swift */, 46D571F42173CF3E00E7FF73 /* UIImage+Ratio.swift */, 46CFE6F621707FA600E7FF73 /* UIViewController+InformationalAlert.swift */, + 02C7B5822501857600C4A310 /* UIImage+Scaling.swift */, ); path = Extensions; sourceTree = ""; @@ -274,6 +303,7 @@ buildActionMask = 2147483647; files = ( 46463786216FDE4C00E7FF73 /* LaunchScreen.storyboard in Resources */, + 02C7B57625015DCC00C4A310 /* GoogleService-Info.plist in Resources */, 46463783216FDE4C00E7FF73 /* Assets.xcassets in Resources */, 46463781216FDE4B00E7FF73 /* Main.storyboard in Resources */, ); @@ -346,17 +376,23 @@ buildActionMask = 2147483647; files = ( 46A0366D2170158900E7FF73 /* SignInViewController.swift in Sources */, + 02C7B5832501857600C4A310 /* UIImage+Scaling.swift in Sources */, 46CFE6FB21714E6100E7FF73 /* Author.swift in Sources */, 46CFE6F92170862C00E7FF73 /* ShiftableViewController.swift in Sources */, + 02C7B579250184C400C4A310 /* BlurViewController.swift in Sources */, + 02C7B57B250184E200C4A310 /* ColorViewController.swift in Sources */, 4646377C216FDE4B00E7FF73 /* AppDelegate.swift in Sources */, 46CFE6FD217154F500E7FF73 /* Networking.swift in Sources */, 46CFE6F521707D0000E7FF73 /* ImagePostViewController.swift in Sources */, 46CFE6FF2171556D00E7FF73 /* ConcurrentOperation.swift in Sources */, + 02C7B57D250184F500C4A310 /* DistortionViewController.swift in Sources */, 46463790216FFD1B00E7FF73 /* Post.swift in Sources */, 46CFE6F32170757F00E7FF73 /* User+DictionaryRepresentation.swift in Sources */, + 02C7B57F2501850200C4A310 /* SharpenViewController.swift in Sources */, 46D571F32172D43B00E7FF73 /* Cache.swift in Sources */, 46CFE7012171559500E7FF73 /* FetchMediaOperation.swift in Sources */, 46D571F82173FC2700E7FF73 /* ImagePostDetailTableViewController.swift in Sources */, + 02C7B5812501850F00C4A310 /* ColorInvertViewController.swift in Sources */, 46CFE7032171572600E7FF73 /* ImagePostCollectionViewCell.swift in Sources */, 4646379C2170091A00E7FF73 /* PostController.swift in Sources */, 464637992170048900E7FF73 /* FirebaseConvertible.swift in Sources */, @@ -511,13 +547,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = QQ666D93S6; INFOPLIST_FILE = "$(SRCROOT)/LambdaTimeline/Resources/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = ""; + PRODUCT_BUNDLE_IDENTIFIER = com.morgansmith.timeline; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -530,13 +566,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = QQ666D93S6; INFOPLIST_FILE = "$(SRCROOT)/LambdaTimeline/Resources/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = ""; + PRODUCT_BUNDLE_IDENTIFIER = com.morgansmith.timeline; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/LambdaTimeline/Filter View Controllers/BlurViewController.swift b/LambdaTimeline/Filter View Controllers/BlurViewController.swift new file mode 100644 index 00000000..c6260ec5 --- /dev/null +++ b/LambdaTimeline/Filter View Controllers/BlurViewController.swift @@ -0,0 +1,110 @@ +// +// BlurViewController.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// + +import UIKit +import CoreImage +import Photos + +class BlurViewController: UIViewController { + + @IBOutlet weak var blurSlider: UISlider! + @IBOutlet weak var imageView: UIImageView! + + private let context = CIContext(options: nil) + let filter = CIFilter(name: "CIGaussianBlur")! + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + setUpBlurSlider() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + + @IBAction func blurChanged(_ sender: UISlider) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(blurSlider.value, forKey: "inputRadius") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + func setUpBlurSlider() { + if let inputRadiusDictionary = filter.attributes["inputRadius"] as? [String: Any], + let sliderMin = inputRadiusDictionary[kCIAttributeSliderMin] as? Float, + let sliderMax = inputRadiusDictionary[kCIAttributeSliderMax] as? Float, + let identity = inputRadiusDictionary[kCIAttributeIdentity] as? Float { + + blurSlider.minimumValue = sliderMin + blurSlider.maximumValue = sliderMax + blurSlider.value = identity + } + } + + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveBlur" { + if let imageVC = segue.destination as? ImagePostViewController, let image = imageView.image { + imageVC.filteredImage = image + imageVC.filteredImageData = imagePostController + } + } + } + + } + diff --git a/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift b/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift new file mode 100644 index 00000000..d70f6d61 --- /dev/null +++ b/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift @@ -0,0 +1,89 @@ +// +// ColorInvertViewController.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// + +import UIKit +import CoreImage +import Photos + +class ColorInvertViewController: UIViewController { + @IBOutlet weak var imageView: UIImageView! + private let context = CIContext(options: nil) + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + @IBAction func invertTapped(_ sender: Any) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let filter = CIFilter(name: "CIColorInvert")! + filter.setValue(ciImage, forKey: "inputImage") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveColorInvert" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + imageVC.filteredImageData = imagePostController + } + } + } + + } + diff --git a/LambdaTimeline/Filter View Controllers/ColorViewController.swift b/LambdaTimeline/Filter View Controllers/ColorViewController.swift new file mode 100644 index 00000000..5a0003cd --- /dev/null +++ b/LambdaTimeline/Filter View Controllers/ColorViewController.swift @@ -0,0 +1,112 @@ +// +// ColorViewController.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// + +import UIKit +import CoreImage +import Photos + +class ColorViewController: UIViewController { + + @IBOutlet weak var brightnessSlider: UISlider! + @IBOutlet weak var contrastSlider: UISlider! + @IBOutlet weak var saturationSlider: UISlider! + @IBOutlet weak var imageView: UIImageView! + + private let context = CIContext(options: nil) + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func brightnessChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func contrastChanged(_ sender: Any) { + updateImage() + } + + @IBAction func saturationChanged(_ sender: Any) { + updateImage() + } + + + @IBAction func saveTapped(_ sender: Any) { + + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + + let filter = CIFilter(name: "CIColorControls")! + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(saturationSlider.value, forKey: "inputSaturation") + filter.setValue(brightnessSlider.value, forKey: "inputBrightness") + filter.setValue(contrastSlider.value, forKey: "inputContrast") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + + + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveColor" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + imageVC.filteredImageData = imagePostController + } + } + } + + + } + diff --git a/LambdaTimeline/Filter View Controllers/DistortionViewController.swift b/LambdaTimeline/Filter View Controllers/DistortionViewController.swift new file mode 100644 index 00000000..1512df97 --- /dev/null +++ b/LambdaTimeline/Filter View Controllers/DistortionViewController.swift @@ -0,0 +1,114 @@ +// +// DistortionViewController.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// +import UIKit +import CoreImage +import Photos + +class DistortionViewController: UIViewController { + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var radiusSlider: UISlider! + @IBOutlet weak var angleSlider: UISlider! + @IBOutlet weak var xCenterSlider: UISlider! + @IBOutlet weak var yCenterSlider: UISlider! + + + private let context = CIContext(options: nil) + let filter = CIFilter(name: "CIVortexDistortion")! + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + + @IBAction func radiusChanged(_ sender: UISlider) { + updateImage() + } + @IBAction func angleChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func xCenterChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func yCenterChanged(_ sender: UISlider) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let center = CIVector(x: CGFloat(xCenterSlider.value), y: CGFloat(yCenterSlider.value)) + + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(radiusSlider.value, forKey: "inputRadius") + filter.setValue(angleSlider.value, forKey: "inputAngle") + filter.setValue(center, forKey: "inputCenter") + + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveDistortion" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + imageVC.filteredImageData = imagePostController + } + } + } + + } diff --git a/LambdaTimeline/Filter View Controllers/SharpenViewController.swift b/LambdaTimeline/Filter View Controllers/SharpenViewController.swift new file mode 100644 index 00000000..5f878dd2 --- /dev/null +++ b/LambdaTimeline/Filter View Controllers/SharpenViewController.swift @@ -0,0 +1,93 @@ +// +// SharpenViewController.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// + +import UIKit +import CoreImage +import Photos + +class SharpenViewController: UIViewController { + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var sharpenSlider: UISlider! + + private let context = CIContext(options: nil) + + let imagePostController = ImagePostViewController.sharedPhoto + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage + } + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage + } + } + + + override func viewDidLoad() { + super.viewDidLoad() + imageView.image = imagePostController + originalImage = imageView.image + } + + @IBAction func saveTapped(_ sender: Any) { + + } + @IBAction func sharpenTapped(_ sender: Any) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let filter = CIFilter(name: "CISharpenLuminance")! + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(sharpenSlider.value, forKey: "inputSharpness") + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveSharpen" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image + imageVC.filteredImageData = imagePostController + } + } + } + + } + + diff --git a/LambdaTimeline/GoogleService-Info.plist b/LambdaTimeline/GoogleService-Info.plist new file mode 100644 index 00000000..801c6a4a --- /dev/null +++ b/LambdaTimeline/GoogleService-Info.plist @@ -0,0 +1,36 @@ + + + + + CLIENT_ID + 408849830962-1k5k0es64ef2la2sa67att0u07tosd87.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.408849830962-1k5k0es64ef2la2sa67att0u07tosd87 + API_KEY + AIzaSyBykBDXjQrcDxtFZPQ4RymzQ_Ahx9ag6Es + GCM_SENDER_ID + 408849830962 + PLIST_VERSION + 1 + BUNDLE_ID + com.morgansmith.timeline + PROJECT_ID + morgan-s-timeline + STORAGE_BUCKET + morgan-s-timeline.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:408849830962:ios:c98be8ae0f90273ff3d82b + DATABASE_URL + https://morgan-s-timeline.firebaseio.com + + \ No newline at end of file diff --git a/LambdaTimeline/Helpers/Extensions/UIImage+Scaling.swift b/LambdaTimeline/Helpers/Extensions/UIImage+Scaling.swift new file mode 100644 index 00000000..c5f5736f --- /dev/null +++ b/LambdaTimeline/Helpers/Extensions/UIImage+Scaling.swift @@ -0,0 +1,40 @@ +// +// UIImage+Scaling.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// + +import UIKit + +extension UIImage { + + /// Resize the image to a max dimension from size parameter + func imageByScaling(toSize size: CGSize) -> UIImage? { + guard size.width > 0 && size.height > 0 else { return nil } + + let originalAspectRatio = self.size.width/self.size.height + var correctedSize = size + + if correctedSize.width > correctedSize.width*originalAspectRatio { + correctedSize.width = correctedSize.width*originalAspectRatio + } else { + correctedSize.height = correctedSize.height/originalAspectRatio + } + + return UIGraphicsImageRenderer(size: correctedSize, format: imageRendererFormat).image { context in + draw(in: CGRect(origin: .zero, size: correctedSize)) + } + } + + /// Renders the image if the pixel data was rotated due to orientation of camera + var flattened: UIImage { + if imageOrientation == .up { return self } + return UIGraphicsImageRenderer(size: size, format: imageRendererFormat).image { context in + draw(at: .zero) + } + } +} + + diff --git a/LambdaTimeline/Resources/Info.plist b/LambdaTimeline/Resources/Info.plist index dab10c0a..1f172fc7 100644 --- a/LambdaTimeline/Resources/Info.plist +++ b/LambdaTimeline/Resources/Info.plist @@ -23,7 +23,7 @@ Editor CFBundleURLSchemes - Copy-paste-your-REVERSED_CLIENT_ID-from-GoogleService-Info.plist + com.googleusercontent.apps.408849830962-1k5k0es64ef2la2sa67att0u07tosd87 diff --git a/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard b/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard index fcec352d..8390ad7d 100644 --- a/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard +++ b/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard @@ -1,10 +1,11 @@ - + - + + @@ -111,16 +112,16 @@ - + - + - + @@ -150,8 +151,17 @@ + - + @@ -187,6 +197,7 @@ + @@ -353,5 +364,525 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LambdaTimeline/View Controllers/ImagePostViewController.swift b/LambdaTimeline/View Controllers/ImagePostViewController.swift index fea207c2..393555f8 100644 --- a/LambdaTimeline/View Controllers/ImagePostViewController.swift +++ b/LambdaTimeline/View Controllers/ImagePostViewController.swift @@ -7,62 +7,76 @@ // import UIKit +import CoreImage import Photos class ImagePostViewController: ShiftableViewController { override func viewDidLoad() { super.viewDidLoad() - + setImageViewHeight(with: 1.0) - - updateViews() + + if let filtered = filteredImage { + imageView.image = filtered + setImageViewHeight(with: filtered.ratio) + title = post?.title ?? "New Post" + chooseImageButton.setTitle("", for: []) + editPhoto.setTitleColor(.systemBlue, for: .normal) + } else { + updateViews() + } } func updateViews() { + editPhoto.setTitle("Edit Photo", for: .normal) guard let imageData = imageData, let image = UIImage(data: imageData) else { title = "New Post" + editPhoto.setTitleColor(.white, for: .normal) return } title = post?.title - + setImageViewHeight(with: image.ratio) imageView.image = image - + + editPhoto.setTitleColor(.systemBlue, for: .normal) + chooseImageButton.setTitle("", for: []) } - + private func presentImagePickerController() { guard UIImagePickerController.isSourceTypeAvailable(.photoLibrary) else { presentInformationalAlertController(title: "Error", message: "The photo library is unavailable") return } - - let imagePicker = UIImagePickerController() - - imagePicker.delegate = self - - imagePicker.sourceType = .photoLibrary + DispatchQueue.main.async { + let imagePicker = UIImagePickerController() + + imagePicker.delegate = self + + imagePicker.sourceType = .photoLibrary - present(imagePicker, animated: true, completion: nil) + self.present(imagePicker, animated: true, completion: nil) + } } @IBAction func createPost(_ sender: Any) { view.endEditing(true) - guard let imageData = imageView.image?.jpegData(compressionQuality: 0.1), - let title = titleTextField.text, title != "" else { - presentInformationalAlertController(title: "Uh-oh", message: "Make sure that you add a photo and a caption before posting.") - return + guard let imageData = filteredImageData?.jpegData(compressionQuality: 0.1) ?? imageView.image?.jpegData(compressionQuality: 0.1), + let title = titleTextField.text, title != "", let ratio = imageView.image?.ratio else { + presentInformationalAlertController(title: "Uh-oh", message: "Make sure that you add a photo and a caption before posting.") + return } - postController.createPost(with: title, ofType: .image, mediaData: imageData, ratio: imageView.image?.ratio) { (success) in + postController.createPost(with: title, ofType: .image, mediaData: imageData, ratio: ratio) { (success) in guard success else { DispatchQueue.main.async { self.presentInformationalAlertController(title: "Error", message: "Unable to create post. Try again.") @@ -107,6 +121,13 @@ class ImagePostViewController: ShiftableViewController { presentImagePickerController() } + + @IBAction func editPhoto(_ sender: Any) { + guard let image = imageView.image else { return } + ImagePostViewController.sharedPhoto = image + } + + func setImageViewHeight(with aspectRatio: CGFloat) { imageHeightConstraint.constant = imageView.frame.size.width * aspectRatio @@ -117,7 +138,11 @@ class ImagePostViewController: ShiftableViewController { var postController: PostController! var post: Post? var imageData: Data? + var filteredImage: UIImage? + var filteredImageData: UIImage? + static var sharedPhoto = UIImage() + @IBOutlet weak var editPhoto: UIButton! @IBOutlet weak var imageView: UIImageView! @IBOutlet weak var titleTextField: UITextField! @IBOutlet weak var chooseImageButton: UIButton! @@ -137,6 +162,10 @@ extension ImagePostViewController: UIImagePickerControllerDelegate, UINavigation imageView.image = image + ImagePostViewController.sharedPhoto = image + + editPhoto.setTitleColor(.systemBlue, for: .normal) + setImageViewHeight(with: image.ratio) } diff --git a/Podfile.lock b/Podfile.lock index 9d835784..244d90e4 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -171,4 +171,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 28424f1a99ace6e65529f57867177322416678fa -COCOAPODS: 1.9.1 +COCOAPODS: 1.9.3 From fac065f37dfbc10a7bdfab0a58736fd5de8b9e3a Mon Sep 17 00:00:00 2001 From: morgan smith Date: Sat, 5 Sep 2020 21:07:35 -0400 Subject: [PATCH 3/3] changed data passing from imagePostViewController to tab controllers to a segue --- LambdaTimeline.xcodeproj/project.pbxproj | 4 + .../BlurViewController.swift | 179 +++++++------- .../ColorInvertViewController.swift | 156 +++++++----- .../ColorViewController.swift | 199 +++++++++------- .../DistortionViewController.swift | 212 +++++++++-------- .../SharpenViewController.swift | 164 +++++++------ .../Helpers/Extensions/CIImage+JPEG.swift | 44 ++++ .../Storyboards/Base.lproj/Main.storyboard | 225 +++++++++++------- .../ImagePostViewController.swift | 105 +++++--- 9 files changed, 753 insertions(+), 535 deletions(-) create mode 100644 LambdaTimeline/Helpers/Extensions/CIImage+JPEG.swift diff --git a/LambdaTimeline.xcodeproj/project.pbxproj b/LambdaTimeline.xcodeproj/project.pbxproj index 0b2cee38..baa9bef8 100644 --- a/LambdaTimeline.xcodeproj/project.pbxproj +++ b/LambdaTimeline.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ 02C7B57F2501850200C4A310 /* SharpenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B57E2501850200C4A310 /* SharpenViewController.swift */; }; 02C7B5812501850F00C4A310 /* ColorInvertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B5802501850F00C4A310 /* ColorInvertViewController.swift */; }; 02C7B5832501857600C4A310 /* UIImage+Scaling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B5822501857600C4A310 /* UIImage+Scaling.swift */; }; + 02C7B5852501B54600C4A310 /* CIImage+JPEG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C7B5842501B54600C4A310 /* CIImage+JPEG.swift */; }; 4646377C216FDE4B00E7FF73 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4646377B216FDE4B00E7FF73 /* AppDelegate.swift */; }; 46463781216FDE4B00E7FF73 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4646377F216FDE4B00E7FF73 /* Main.storyboard */; }; 46463783216FDE4C00E7FF73 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46463782216FDE4C00E7FF73 /* Assets.xcassets */; }; @@ -47,6 +48,7 @@ 02C7B57E2501850200C4A310 /* SharpenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharpenViewController.swift; sourceTree = ""; }; 02C7B5802501850F00C4A310 /* ColorInvertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorInvertViewController.swift; sourceTree = ""; }; 02C7B5822501857600C4A310 /* UIImage+Scaling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Scaling.swift"; sourceTree = ""; }; + 02C7B5842501B54600C4A310 /* CIImage+JPEG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CIImage+JPEG.swift"; sourceTree = ""; }; 33A2B89DE9E21538434BD640 /* Pods-LambdaTimeline.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LambdaTimeline.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LambdaTimeline/Pods-LambdaTimeline.debug.xcconfig"; sourceTree = ""; }; 46463778216FDE4B00E7FF73 /* LambdaTimeline.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LambdaTimeline.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4646377B216FDE4B00E7FF73 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -228,6 +230,7 @@ 46D571F42173CF3E00E7FF73 /* UIImage+Ratio.swift */, 46CFE6F621707FA600E7FF73 /* UIViewController+InformationalAlert.swift */, 02C7B5822501857600C4A310 /* UIImage+Scaling.swift */, + 02C7B5842501B54600C4A310 /* CIImage+JPEG.swift */, ); path = Extensions; sourceTree = ""; @@ -380,6 +383,7 @@ 46CFE6FB21714E6100E7FF73 /* Author.swift in Sources */, 46CFE6F92170862C00E7FF73 /* ShiftableViewController.swift in Sources */, 02C7B579250184C400C4A310 /* BlurViewController.swift in Sources */, + 02C7B5852501B54600C4A310 /* CIImage+JPEG.swift in Sources */, 02C7B57B250184E200C4A310 /* ColorViewController.swift in Sources */, 4646377C216FDE4B00E7FF73 /* AppDelegate.swift in Sources */, 46CFE6FD217154F500E7FF73 /* Networking.swift in Sources */, diff --git a/LambdaTimeline/Filter View Controllers/BlurViewController.swift b/LambdaTimeline/Filter View Controllers/BlurViewController.swift index c6260ec5..4ae74c96 100644 --- a/LambdaTimeline/Filter View Controllers/BlurViewController.swift +++ b/LambdaTimeline/Filter View Controllers/BlurViewController.swift @@ -11,100 +11,107 @@ import CoreImage import Photos class BlurViewController: UIViewController { - + @IBOutlet weak var blurSlider: UISlider! @IBOutlet weak var imageView: UIImageView! - - private let context = CIContext(options: nil) - let filter = CIFilter(name: "CIGaussianBlur")! - - let imagePostController = ImagePostViewController.sharedPhoto - - var originalImage: UIImage? { - didSet { - guard let image = originalImage else { return } - - var scaledSize = imageView.bounds.size - let scale = UIScreen.main.scale - - scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) - - let scaledImage = image.imageByScaling(toSize: scaledSize) - self.scaledImage = scaledImage - } - } - - var scaledImage: UIImage? { - didSet { - imageView.image = scaledImage - } + + private let context = CIContext(options: nil) + let filter = CIFilter(name: "CIGaussianBlur")! + + var originalImagePost: UIImage? + var savedPhoto: UIImage? + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage } - - - override func viewDidLoad() { - super.viewDidLoad() - setUpBlurSlider() - imageView.image = imagePostController - originalImage = imageView.image + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage } - + } + + + override func viewDidLoad() { + super.viewDidLoad() + setUpBlurSlider() + guard let postImage = originalImagePost else { return } + originalImage = postImage + imageView.image = originalImage + } + @IBAction func saveTapped(_ sender: Any) { - + + } + + @IBAction func doneEditing(_ sender: Any) { + + } + + + @IBAction func blurChanged(_ sender: UISlider) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + + } else { + imageView.image = nil } - - @IBAction func blurChanged(_ sender: UISlider) { - updateImage() + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(blurSlider.value, forKey: "inputRadius") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + savedPhoto = UIImage(cgImage: outputCGImage) + return UIImage(cgImage: outputCGImage) + } + + + func setUpBlurSlider() { + if let inputRadiusDictionary = filter.attributes["inputRadius"] as? [String: Any], + let sliderMin = inputRadiusDictionary[kCIAttributeSliderMin] as? Float, + let sliderMax = inputRadiusDictionary[kCIAttributeSliderMax] as? Float, + let identity = inputRadiusDictionary[kCIAttributeIdentity] as? Float { + + blurSlider.minimumValue = sliderMin + blurSlider.maximumValue = sliderMax + blurSlider.value = identity } - - - private func updateImage() { - if let scaledImage = scaledImage { - imageView.image = image(byFiltering: scaledImage) - - } else { - imageView.image = nil - } - } - - private func image(byFiltering image: UIImage) -> UIImage { - - guard let cgImage = image.cgImage else { return image} - - let ciImage = CIImage(cgImage: cgImage) - - filter.setValue(ciImage, forKey: "inputImage") - filter.setValue(blurSlider.value, forKey: "inputRadius") - - guard let outputImage = filter.outputImage else { return image } - - guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } - - return UIImage(cgImage: outputCGImage) - } - - func setUpBlurSlider() { - if let inputRadiusDictionary = filter.attributes["inputRadius"] as? [String: Any], - let sliderMin = inputRadiusDictionary[kCIAttributeSliderMin] as? Float, - let sliderMax = inputRadiusDictionary[kCIAttributeSliderMax] as? Float, - let identity = inputRadiusDictionary[kCIAttributeIdentity] as? Float { - - blurSlider.minimumValue = sliderMin - blurSlider.maximumValue = sliderMax - blurSlider.value = identity + } + + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveBlur" { + if let imageVC = segue.destination as? ImagePostViewController, let photo = savedPhoto { + imageVC.filteredImage = photo } } - - - // MARK: - Navigation - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "saveBlur" { - if let imageVC = segue.destination as? ImagePostViewController, let image = imageView.image { - imageVC.filteredImage = image - imageVC.filteredImageData = imagePostController - } - } - } - } + +} diff --git a/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift b/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift index d70f6d61..5ccae1e1 100644 --- a/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift +++ b/LambdaTimeline/Filter View Controllers/ColorInvertViewController.swift @@ -12,78 +12,102 @@ import Photos class ColorInvertViewController: UIViewController { @IBOutlet weak var imageView: UIImageView! - private let context = CIContext(options: nil) - - let imagePostController = ImagePostViewController.sharedPhoto - - var originalImage: UIImage? { - didSet { - guard let image = originalImage else { return } - - var scaledSize = imageView.bounds.size - let scale = UIScreen.main.scale - - scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) - - let scaledImage = image.imageByScaling(toSize: scaledSize) - self.scaledImage = scaledImage - } - } - - var scaledImage: UIImage? { - didSet { - imageView.image = scaledImage - } + private let context = CIContext(options: nil) + var originalImagePost: UIImage? + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage } - - - override func viewDidLoad() { - super.viewDidLoad() - imageView.image = imagePostController - originalImage = imageView.image + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage } - - @IBAction func saveTapped(_ sender: Any) { - + } + + + override func viewDidLoad() { + super.viewDidLoad() + guard let postImage = originalImagePost else { return } + originalImage = postImage + imageView.image = originalImage + } + + @IBAction func saveTapped(_ sender: Any) { + guard let originalImage = originalImage else { return } + + let filteredImage = image(byFiltering: originalImage) + + PHPhotoLibrary.requestAuthorization { (status) in + + guard status == .authorized else { + NSLog("The user has not authorized permission for photo library usage.") + return + + PHPhotoLibrary.shared().performChanges({ + + PHAssetCreationRequest.creationRequestForAsset(from: filteredImage) + + }) { (success, error) in + if let error = error { + NSLog("Error saving photo asset: \(error)") + return + } + + } + } + } + + + } @IBAction func invertTapped(_ sender: Any) { updateImage() } - - - private func updateImage() { - if let scaledImage = scaledImage { - imageView.image = image(byFiltering: scaledImage) - } else { - imageView.image = nil - } - } - - private func image(byFiltering image: UIImage) -> UIImage { - - guard let cgImage = image.cgImage else { return image} - - let ciImage = CIImage(cgImage: cgImage) - let filter = CIFilter(name: "CIColorInvert")! - filter.setValue(ciImage, forKey: "inputImage") - - guard let outputImage = filter.outputImage else { return image } - - guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } - - return UIImage(cgImage: outputCGImage) - } - - // MARK: - Navigation - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "saveColorInvert" { - if let imageVC = segue.destination as? ImagePostViewController { - imageVC.filteredImage = imageView.image - imageVC.filteredImageData = imagePostController - } - } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil + } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let filter = CIFilter(name: "CIColorInvert")! + filter.setValue(ciImage, forKey: "inputImage") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveColorInvert" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image } - + } } + +} diff --git a/LambdaTimeline/Filter View Controllers/ColorViewController.swift b/LambdaTimeline/Filter View Controllers/ColorViewController.swift index 5a0003cd..6ed1ff1c 100644 --- a/LambdaTimeline/Filter View Controllers/ColorViewController.swift +++ b/LambdaTimeline/Filter View Controllers/ColorViewController.swift @@ -11,102 +11,123 @@ import CoreImage import Photos class ColorViewController: UIViewController { - + @IBOutlet weak var brightnessSlider: UISlider! - @IBOutlet weak var contrastSlider: UISlider! - @IBOutlet weak var saturationSlider: UISlider! - @IBOutlet weak var imageView: UIImageView! - - private let context = CIContext(options: nil) - - let imagePostController = ImagePostViewController.sharedPhoto - - var originalImage: UIImage? { - didSet { - guard let image = originalImage else { return } - - var scaledSize = imageView.bounds.size - let scale = UIScreen.main.scale - - scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) - - let scaledImage = image.imageByScaling(toSize: scaledSize) - self.scaledImage = scaledImage - } - } - - var scaledImage: UIImage? { - didSet { - imageView.image = scaledImage - } + @IBOutlet weak var contrastSlider: UISlider! + @IBOutlet weak var saturationSlider: UISlider! + @IBOutlet weak var imageView: UIImageView! + + private let context = CIContext(options: nil) + var originalImagePost: UIImage? + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage } - - - override func viewDidLoad() { - super.viewDidLoad() - imageView.image = imagePostController - originalImage = imageView.image - } - - @IBAction func brightnessChanged(_ sender: UISlider) { - updateImage() - } - - @IBAction func contrastChanged(_ sender: Any) { - updateImage() - } - - @IBAction func saturationChanged(_ sender: Any) { - updateImage() - } - - - @IBAction func saveTapped(_ sender: Any) { - + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage } - - - private func updateImage() { - if let scaledImage = scaledImage { - imageView.image = image(byFiltering: scaledImage) - } else { - imageView.image = nil + } + + + override func viewDidLoad() { + super.viewDidLoad() + guard let postImage = originalImagePost else { return } + originalImage = postImage + imageView.image = originalImage + } + + @IBAction func brightnessChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func contrastChanged(_ sender: Any) { + updateImage() + } + + @IBAction func saturationChanged(_ sender: Any) { + updateImage() + } + + + @IBAction func saveTapped(_ sender: Any) { + guard let originalImage = originalImage else { return } + + let filteredImage = image(byFiltering: originalImage) + + PHPhotoLibrary.requestAuthorization { (status) in + + guard status == .authorized else { + NSLog("The user has not authorized permission for photo library usage.") + return + + PHPhotoLibrary.shared().performChanges({ + + PHAssetCreationRequest.creationRequestForAsset(from: filteredImage) + + }) { (success, error) in + if let error = error { + NSLog("Error saving photo asset: \(error)") + return + } + + } } + } - - private func image(byFiltering image: UIImage) -> UIImage { - - guard let cgImage = image.cgImage else { return image} - - let ciImage = CIImage(cgImage: cgImage) - - let filter = CIFilter(name: "CIColorControls")! - filter.setValue(ciImage, forKey: "inputImage") - filter.setValue(saturationSlider.value, forKey: "inputSaturation") - filter.setValue(brightnessSlider.value, forKey: "inputBrightness") - filter.setValue(contrastSlider.value, forKey: "inputContrast") - - guard let outputImage = filter.outputImage else { return image } - - guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } - - return UIImage(cgImage: outputCGImage) + + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil } - - - - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "saveColor" { - if let imageVC = segue.destination as? ImagePostViewController { - imageVC.filteredImage = imageView.image - imageVC.filteredImageData = imagePostController - } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + + let filter = CIFilter(name: "CIColorControls")! + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(saturationSlider.value, forKey: "inputSaturation") + filter.setValue(brightnessSlider.value, forKey: "inputBrightness") + filter.setValue(contrastSlider.value, forKey: "inputContrast") + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + + + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveColor" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image } } - - } +} diff --git a/LambdaTimeline/Filter View Controllers/DistortionViewController.swift b/LambdaTimeline/Filter View Controllers/DistortionViewController.swift index 1512df97..cf2f2a58 100644 --- a/LambdaTimeline/Filter View Controllers/DistortionViewController.swift +++ b/LambdaTimeline/Filter View Controllers/DistortionViewController.swift @@ -10,105 +10,129 @@ import CoreImage import Photos class DistortionViewController: UIViewController { - - @IBOutlet weak var imageView: UIImageView! - @IBOutlet weak var radiusSlider: UISlider! - @IBOutlet weak var angleSlider: UISlider! - @IBOutlet weak var xCenterSlider: UISlider! - @IBOutlet weak var yCenterSlider: UISlider! - - - private let context = CIContext(options: nil) - let filter = CIFilter(name: "CIVortexDistortion")! - - let imagePostController = ImagePostViewController.sharedPhoto - - var originalImage: UIImage? { - didSet { - guard let image = originalImage else { return } - - var scaledSize = imageView.bounds.size - let scale = UIScreen.main.scale - - scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) - - let scaledImage = image.imageByScaling(toSize: scaledSize) - self.scaledImage = scaledImage - } - } - - var scaledImage: UIImage? { - didSet { - imageView.image = scaledImage - } - } - - - override func viewDidLoad() { - super.viewDidLoad() - imageView.image = imagePostController - originalImage = imageView.image - } - - @IBAction func saveTapped(_ sender: Any) { - - } - - @IBAction func radiusChanged(_ sender: UISlider) { - updateImage() + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var radiusSlider: UISlider! + @IBOutlet weak var angleSlider: UISlider! + @IBOutlet weak var xCenterSlider: UISlider! + @IBOutlet weak var yCenterSlider: UISlider! + + + private let context = CIContext(options: nil) + let filter = CIFilter(name: "CIVortexDistortion")! + var originalImagePost: UIImage? + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage } - @IBAction func angleChanged(_ sender: UISlider) { - updateImage() - } - - @IBAction func xCenterChanged(_ sender: UISlider) { - updateImage() - } - - @IBAction func yCenterChanged(_ sender: UISlider) { - updateImage() + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage } - - - private func updateImage() { - if let scaledImage = scaledImage { - imageView.image = image(byFiltering: scaledImage) - } else { - imageView.image = nil + } + + + override func viewDidLoad() { + super.viewDidLoad() + guard let postImage = originalImagePost else { return } + originalImage = postImage + imageView.image = originalImage + } + + @IBAction func saveTapped(_ sender: Any) { + guard let originalImage = originalImage else { return } + + let filteredImage = image(byFiltering: originalImage) + + PHPhotoLibrary.requestAuthorization { (status) in + + guard status == .authorized else { + NSLog("The user has not authorized permission for photo library usage.") + return + + PHPhotoLibrary.shared().performChanges({ + + PHAssetCreationRequest.creationRequestForAsset(from: filteredImage) + + }) { (success, error) in + if let error = error { + NSLog("Error saving photo asset: \(error)") + return + } + + } } + } - - private func image(byFiltering image: UIImage) -> UIImage { - - guard let cgImage = image.cgImage else { return image} - - let ciImage = CIImage(cgImage: cgImage) - let center = CIVector(x: CGFloat(xCenterSlider.value), y: CGFloat(yCenterSlider.value)) - - filter.setValue(ciImage, forKey: "inputImage") - filter.setValue(radiusSlider.value, forKey: "inputRadius") - filter.setValue(angleSlider.value, forKey: "inputAngle") - filter.setValue(center, forKey: "inputCenter") - - - guard let outputImage = filter.outputImage else { return image } - - guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } - - return UIImage(cgImage: outputCGImage) + + + } + + @IBAction func radiusChanged(_ sender: UISlider) { + updateImage() + } + @IBAction func angleChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func xCenterChanged(_ sender: UISlider) { + updateImage() + } + + @IBAction func yCenterChanged(_ sender: UISlider) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil } - - - - // MARK: - Navigation - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "saveDistortion" { - if let imageVC = segue.destination as? ImagePostViewController { - imageVC.filteredImage = imageView.image - imageVC.filteredImageData = imagePostController - } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let center = CIVector(x: CGFloat(xCenterSlider.value), y: CGFloat(yCenterSlider.value)) + + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(radiusSlider.value, forKey: "inputRadius") + filter.setValue(angleSlider.value, forKey: "inputAngle") + filter.setValue(center, forKey: "inputCenter") + + + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveDistortion" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image } } - } + +} diff --git a/LambdaTimeline/Filter View Controllers/SharpenViewController.swift b/LambdaTimeline/Filter View Controllers/SharpenViewController.swift index 5f878dd2..df14fbca 100644 --- a/LambdaTimeline/Filter View Controllers/SharpenViewController.swift +++ b/LambdaTimeline/Filter View Controllers/SharpenViewController.swift @@ -11,83 +11,107 @@ import CoreImage import Photos class SharpenViewController: UIViewController { - - @IBOutlet weak var imageView: UIImageView! - @IBOutlet weak var sharpenSlider: UISlider! - - private let context = CIContext(options: nil) - - let imagePostController = ImagePostViewController.sharedPhoto - - var originalImage: UIImage? { - didSet { - guard let image = originalImage else { return } - - var scaledSize = imageView.bounds.size - let scale = UIScreen.main.scale - - scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) - - let scaledImage = image.imageByScaling(toSize: scaledSize) - self.scaledImage = scaledImage - } - } - - var scaledImage: UIImage? { - didSet { - imageView.image = scaledImage - } - } - - - override func viewDidLoad() { - super.viewDidLoad() - imageView.image = imagePostController - originalImage = imageView.image + + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var sharpenSlider: UISlider! + + private let context = CIContext(options: nil) + var originalImagePost: UIImage? + + var originalImage: UIImage? { + didSet { + guard let image = originalImage else { return } + + var scaledSize = imageView.bounds.size + let scale = UIScreen.main.scale + + scaledSize = CGSize(width: scaledSize.width * scale, height: scaledSize.height * scale) + + let scaledImage = image.imageByScaling(toSize: scaledSize) + self.scaledImage = scaledImage } - - @IBAction func saveTapped(_ sender: Any) { - - } - @IBAction func sharpenTapped(_ sender: Any) { - updateImage() + } + + var scaledImage: UIImage? { + didSet { + imageView.image = scaledImage } - - - private func updateImage() { - if let scaledImage = scaledImage { - imageView.image = image(byFiltering: scaledImage) - } else { - imageView.image = nil + } + + + override func viewDidLoad() { + super.viewDidLoad() + guard let postImage = originalImagePost else { return } + originalImage = postImage + imageView.image = originalImage + } + + @IBAction func saveTapped(_ sender: Any) { + guard let originalImage = originalImage else { return } + + let filteredImage = image(byFiltering: originalImage) + + PHPhotoLibrary.requestAuthorization { (status) in + + guard status == .authorized else { + NSLog("The user has not authorized permission for photo library usage.") + return + + PHPhotoLibrary.shared().performChanges({ + + PHAssetCreationRequest.creationRequestForAsset(from: filteredImage) + + }) { (success, error) in + if let error = error { + NSLog("Error saving photo asset: \(error)") + return + } + + } } + } - - private func image(byFiltering image: UIImage) -> UIImage { - - guard let cgImage = image.cgImage else { return image} - - let ciImage = CIImage(cgImage: cgImage) - let filter = CIFilter(name: "CISharpenLuminance")! - filter.setValue(ciImage, forKey: "inputImage") - filter.setValue(sharpenSlider.value, forKey: "inputSharpness") - guard let outputImage = filter.outputImage else { return image } - - guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } - - return UIImage(cgImage: outputCGImage) + + + } + @IBAction func sharpenTapped(_ sender: Any) { + updateImage() + } + + + private func updateImage() { + if let scaledImage = scaledImage { + imageView.image = image(byFiltering: scaledImage) + } else { + imageView.image = nil } - - // MARK: - Navigation - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "saveSharpen" { - if let imageVC = segue.destination as? ImagePostViewController { - imageVC.filteredImage = imageView.image - imageVC.filteredImageData = imagePostController - } + } + + private func image(byFiltering image: UIImage) -> UIImage { + + guard let cgImage = image.cgImage else { return image} + + let ciImage = CIImage(cgImage: cgImage) + let filter = CIFilter(name: "CISharpenLuminance")! + filter.setValue(ciImage, forKey: "inputImage") + filter.setValue(sharpenSlider.value, forKey: "inputSharpness") + guard let outputImage = filter.outputImage else { return image } + + guard let outputCGImage = context.createCGImage(outputImage, from: outputImage.extent) else { return image } + + return UIImage(cgImage: outputCGImage) + } + + // MARK: - Navigation + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "saveSharpen" { + if let imageVC = segue.destination as? ImagePostViewController { + imageVC.filteredImage = imageView.image } } - } + +} diff --git a/LambdaTimeline/Helpers/Extensions/CIImage+JPEG.swift b/LambdaTimeline/Helpers/Extensions/CIImage+JPEG.swift new file mode 100644 index 00000000..423b71cf --- /dev/null +++ b/LambdaTimeline/Helpers/Extensions/CIImage+JPEG.swift @@ -0,0 +1,44 @@ +// +// CIImage+JPEG.swift +// LambdaTimeline +// +// Created by Morgan Smith on 9/3/20. +// Copyright © 2020 Lambda School. All rights reserved. +// + +import UIKit +import CoreImage +import Photos +extension CIImage { + + func saveJPEG(_ name:String, inDirectoryURL:URL? = nil, quality:CGFloat = 1.0) -> String? { + + var destinationURL = inDirectoryURL + + if destinationURL == nil { + destinationURL = try? FileManager.default.url(for:.documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true) + } + + if var destinationURL = destinationURL { + + destinationURL = destinationURL.appendingPathComponent(name) + + if let colorSpace = CGColorSpace(name: CGColorSpace.sRGB) { + + do { + + let context = CIContext() + + try context.writeJPEGRepresentation(of: self, to: destinationURL, colorSpace: colorSpace, options: [kCGImageDestinationLossyCompressionQuality as CIImageRepresentationOption : quality]) + + return destinationURL.path + + } catch { + return nil + } + } + } + + return nil + } +} diff --git a/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard b/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard index 8390ad7d..115645fc 100644 --- a/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard +++ b/LambdaTimeline/Storyboards/Base.lproj/Main.storyboard @@ -157,7 +157,7 @@ - + @@ -398,30 +398,29 @@ - + - - + - + - + - + - + @@ -429,7 +428,7 @@ - - - + - - - - + + + - - - - - - - + + + + + + + @@ -487,18 +492,17 @@ - + - - - + + + - - - - - - + + + + + + @@ -550,18 +564,17 @@ - + - - + - + - + @@ -578,7 +591,7 @@ + - + - - - - - + + + + + - + @@ -625,18 +648,17 @@ - + - - + - + - + @@ -653,7 +675,7 @@ - + - + @@ -670,7 +692,7 @@ - + - + @@ -687,7 +709,7 @@ - + - + @@ -704,7 +726,7 @@ + @@ -723,12 +755,13 @@ - - - - - - + + + + + + + @@ -754,21 +787,20 @@ - + - - + - + - + - + @@ -785,7 +817,7 @@ - + - + @@ -802,7 +834,7 @@ - + - + @@ -819,7 +851,7 @@ + - + @@ -841,23 +883,23 @@ - - - - + + + + - - - - - - - + + + + + + + @@ -880,7 +922,8 @@ - + + diff --git a/LambdaTimeline/View Controllers/ImagePostViewController.swift b/LambdaTimeline/View Controllers/ImagePostViewController.swift index 393555f8..8a1abecf 100644 --- a/LambdaTimeline/View Controllers/ImagePostViewController.swift +++ b/LambdaTimeline/View Controllers/ImagePostViewController.swift @@ -12,18 +12,35 @@ import Photos class ImagePostViewController: ShiftableViewController { + @IBOutlet weak var editPhoto: UIButton! + @IBOutlet weak var imageView: UIImageView! + @IBOutlet weak var titleTextField: UITextField! + @IBOutlet weak var chooseImageButton: UIButton! + @IBOutlet weak var imageHeightConstraint: NSLayoutConstraint! + @IBOutlet weak var postButton: UIBarButtonItem! + + var postController: PostController! + var post: Post? + var imageData: Data? + var filteredImage: UIImage? + var originalImagePost: UIImage? { + didSet { + print("set the original image in postController") + viewDidLoad() + } + } + override func viewDidLoad() { super.viewDidLoad() - - setImageViewHeight(with: 1.0) - - if let filtered = filteredImage { - imageView.image = filtered - setImageViewHeight(with: filtered.ratio) - title = post?.title ?? "New Post" + if let filteredImage = filteredImage { + setImageViewHeight(with: filteredImage.ratio) + imageView.image = filteredImage + editPhoto.setTitle("Edit Photo", for: .normal) + editPhoto.setTitleColor(.systemBlue, for: .normal) + title = "New Post" chooseImageButton.setTitle("", for: []) - editPhoto.setTitleColor(.systemBlue, for: .normal) } else { + setImageViewHeight(with: 1.0) updateViews() } } @@ -39,16 +56,16 @@ class ImagePostViewController: ShiftableViewController { } title = post?.title - + setImageViewHeight(with: image.ratio) imageView.image = image - + editPhoto.setTitleColor(.systemBlue, for: .normal) - + chooseImageButton.setTitle("", for: []) } - + private func presentImagePickerController() { guard UIImagePickerController.isSourceTypeAvailable(.photoLibrary) else { @@ -57,11 +74,11 @@ class ImagePostViewController: ShiftableViewController { } DispatchQueue.main.async { let imagePicker = UIImagePickerController() - + imagePicker.delegate = self - + imagePicker.sourceType = .photoLibrary - + self.present(imagePicker, animated: true, completion: nil) } } @@ -70,7 +87,7 @@ class ImagePostViewController: ShiftableViewController { view.endEditing(true) - guard let imageData = filteredImageData?.jpegData(compressionQuality: 0.1) ?? imageView.image?.jpegData(compressionQuality: 0.1), + guard let imageData = imageView.image?.jpegData(compressionQuality: 0.1), let title = titleTextField.text, title != "", let ratio = imageView.image?.ratio else { presentInformationalAlertController(title: "Uh-oh", message: "Make sure that you add a photo and a caption before posting.") return @@ -119,15 +136,13 @@ class ImagePostViewController: ShiftableViewController { print("FatalError") } presentImagePickerController() - + } - + @IBAction func editPhoto(_ sender: Any) { - guard let image = imageView.image else { return } - ImagePostViewController.sharedPhoto = image } - - + + func setImageViewHeight(with aspectRatio: CGFloat) { imageHeightConstraint.constant = imageView.frame.size.width * aspectRatio @@ -135,25 +150,37 @@ class ImagePostViewController: ShiftableViewController { view.layoutSubviews() } - var postController: PostController! - var post: Post? - var imageData: Data? - var filteredImage: UIImage? - var filteredImageData: UIImage? - static var sharedPhoto = UIImage() + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if segue.identifier == "editPhotoSegue" { + if let tabController = segue.destination as? UITabBarController { + let blurController = tabController.children.first(where: { $0 is BlurViewController }) + (blurController as? BlurViewController)?.originalImagePost = self.originalImagePost + + let colorController = tabController.children.first(where: { $0 is ColorViewController }) + (colorController as? ColorViewController)?.originalImagePost = self.originalImagePost + + let distortionController = tabController.children.first(where: { $0 is DistortionViewController }) + (distortionController as? DistortionViewController)?.originalImagePost = self.originalImagePost + let sharpenController = tabController.children.first(where: { $0 is SharpenViewController }) + (sharpenController as? SharpenViewController)?.originalImagePost = self.originalImagePost + let colorInvertController = tabController.children.first(where: { $0 is ColorInvertViewController }) + (colorInvertController as? ColorInvertViewController)?.originalImagePost = self.originalImagePost + + + + + + } + } + } + - @IBOutlet weak var editPhoto: UIButton! - @IBOutlet weak var imageView: UIImageView! - @IBOutlet weak var titleTextField: UITextField! - @IBOutlet weak var chooseImageButton: UIButton! - @IBOutlet weak var imageHeightConstraint: NSLayoutConstraint! - @IBOutlet weak var postButton: UIBarButtonItem! } extension ImagePostViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate { func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) { - + chooseImageButton.setTitle("", for: []) picker.dismiss(animated: true, completion: nil) @@ -161,12 +188,12 @@ extension ImagePostViewController: UIImagePickerControllerDelegate, UINavigation guard let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage else { return } imageView.image = image - - ImagePostViewController.sharedPhoto = image - - editPhoto.setTitleColor(.systemBlue, for: .normal) + originalImagePost = image setImageViewHeight(with: image.ratio) + + editPhoto.setTitleColor(.systemBlue, for: .normal) + } func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {