From 8cdd17ad9b42e46216599d1f169f6708beeb0094 Mon Sep 17 00:00:00 2001 From: Pedro Vazquez Date: Tue, 10 Dec 2019 23:20:21 -0600 Subject: [PATCH 1/3] i made like and Filters --- Podfile.lock | 2 +- fakestagram.xcodeproj/project.pbxproj | 64 ++++- fakestagram/AppDelegate.swift | 2 +- fakestagram/Base.lproj/Main.storyboard | 70 ++++- fakestagram/DataSource/RestClient.swift | 21 ++ fakestagram/Models/Post.swift | 1 + .../Services/ComentsAndLikesServices.swift | 45 +++ fakestagram/Utils/FastConstraints.swift | 263 ++++++++++++++++++ .../CameraViewController.swift | 42 ++- .../CollectionViewController.swift | 131 +++++++++ .../CollectionViewController.xib | 31 +++ .../ViewControllers/PostViewController.swift | 1 + .../ViewControllers/PostsViewController.swift | 1 + .../PreviewViewController.swift | 157 +++++++++++ .../ViewControllers/PreviewViewController.xib | 176 ++++++++++++ .../Views/CommentsCollectionViewCell.swift | 19 ++ .../Views/CommentsCollectionViewCell.xib | 50 ++++ .../Views/FiltersCollectionViewCell.swift | 76 +++++ .../Views/FiltersCollectionViewCell.xib | 51 ++++ .../Views/PostCollectionViewCell.swift | 31 +++ fakestagram/Views/PostCollectionViewCell.xib | 25 +- 21 files changed, 1220 insertions(+), 39 deletions(-) create mode 100644 fakestagram/Services/ComentsAndLikesServices.swift create mode 100644 fakestagram/Utils/FastConstraints.swift create mode 100644 fakestagram/ViewControllers/CollectionViewController.swift create mode 100644 fakestagram/ViewControllers/CollectionViewController.xib create mode 100644 fakestagram/ViewControllers/PreviewViewController.swift create mode 100644 fakestagram/ViewControllers/PreviewViewController.xib create mode 100644 fakestagram/Views/CommentsCollectionViewCell.swift create mode 100644 fakestagram/Views/CommentsCollectionViewCell.xib create mode 100644 fakestagram/Views/FiltersCollectionViewCell.swift create mode 100644 fakestagram/Views/FiltersCollectionViewCell.xib diff --git a/Podfile.lock b/Podfile.lock index 12505e8..b5bd883 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -17,4 +17,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 02c21c317ba9be4fdecdfff242f3fa20e9b269bd -COCOAPODS: 1.8.3 +COCOAPODS: 1.8.4 diff --git a/fakestagram.xcodeproj/project.pbxproj b/fakestagram.xcodeproj/project.pbxproj index fd88dc7..9d39683 100644 --- a/fakestagram.xcodeproj/project.pbxproj +++ b/fakestagram.xcodeproj/project.pbxproj @@ -8,6 +8,18 @@ /* Begin PBXBuildFile section */ 05D8E963168944918FFCC7FF /* Pods_fakestagram.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFAA8B9133CEE464C903FDF5 /* Pods_fakestagram.framework */; }; + AD065EFE23A0133D00CE9835 /* ComentsAndLikesServices.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065EFD23A0133D00CE9835 /* ComentsAndLikesServices.swift */; }; + AD065F0123A02B1200CE9835 /* CollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065EFF23A02B1200CE9835 /* CollectionViewController.swift */; }; + AD065F0223A02B1200CE9835 /* CollectionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD065F0023A02B1200CE9835 /* CollectionViewController.xib */; }; + AD065F0423A030F000CE9835 /* FastConstraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065F0323A030F000CE9835 /* FastConstraints.swift */; }; + AD065F0723A06AF200CE9835 /* CommentsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065F0523A06AF200CE9835 /* CommentsCollectionViewCell.swift */; }; + AD065F0823A06AF200CE9835 /* CommentsCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD065F0623A06AF200CE9835 /* CommentsCollectionViewCell.xib */; }; + AD065F0B23A084F800CE9835 /* ShowPostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065F0923A084F800CE9835 /* ShowPostViewController.swift */; }; + AD065F0C23A084F800CE9835 /* ShowPostViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD065F0A23A084F800CE9835 /* ShowPostViewController.xib */; }; + AD065F1023A0875C00CE9835 /* PreviewViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD065F0E23A0875C00CE9835 /* PreviewViewController.xib */; }; + AD065F1223A09C0100CE9835 /* PreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065F1123A09C0100CE9835 /* PreviewViewController.swift */; }; + AD065F1523A0A02200CE9835 /* FiltersCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD065F1323A0A02200CE9835 /* FiltersCollectionViewCell.swift */; }; + AD065F1623A0A02300CE9835 /* FiltersCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD065F1423A0A02200CE9835 /* FiltersCollectionViewCell.xib */; }; D3D164DC7444072103DE027D /* Pods_fakestagramTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E669E31C92D68155914FC99D /* Pods_fakestagramTests.framework */; }; E023A5542380859200B13B7D /* NotificationKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = E023A5532380859200B13B7D /* NotificationKeys.swift */; }; E038FCED233FC78600E28571 /* PostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E038FCEC233FC78600E28571 /* PostViewController.swift */; }; @@ -33,8 +45,6 @@ E0C93E9923514D8800FD330C /* posts.successful.json in Resources */ = {isa = PBXBuildFile; fileRef = E0C93E9823514D8800FD330C /* posts.successful.json */; }; E0C93E9B23515A0400FD330C /* show_post.successful.json in Resources */ = {isa = PBXBuildFile; fileRef = E0C93E9A23515A0400FD330C /* show_post.successful.json */; }; E0C93E9D23515CEE00FD330C /* CodableSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C93E9C23515CEE00FD330C /* CodableSerializer.swift */; }; - E0C93EA123523B7C00FD330C /* ShowPostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C93E9F23523B7C00FD330C /* ShowPostViewController.swift */; }; - E0C93EA223523B7C00FD330C /* ShowPostViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C93EA023523B7C00FD330C /* ShowPostViewController.xib */; }; E0C93EA42352452900FD330C /* AuthorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C93EA32352452900FD330C /* AuthorView.swift */; }; E0C93EA62352454E00FD330C /* Author.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C93EA52352454E00FD330C /* Author.swift */; }; E0C93EA82352455C00FD330C /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C93EA72352455C00FD330C /* Comment.swift */; }; @@ -65,6 +75,18 @@ /* Begin PBXFileReference section */ 5E0AE2BFBF9C8D81E583E1BE /* Pods-fakestagramTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fakestagramTests.release.xcconfig"; path = "Target Support Files/Pods-fakestagramTests/Pods-fakestagramTests.release.xcconfig"; sourceTree = ""; }; 66342726A6BCEEEF6289B1AA /* Pods-fakestagramTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fakestagramTests.debug.xcconfig"; path = "Target Support Files/Pods-fakestagramTests/Pods-fakestagramTests.debug.xcconfig"; sourceTree = ""; }; + AD065EFD23A0133D00CE9835 /* ComentsAndLikesServices.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComentsAndLikesServices.swift; sourceTree = ""; }; + AD065EFF23A02B1200CE9835 /* CollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewController.swift; sourceTree = ""; }; + AD065F0023A02B1200CE9835 /* CollectionViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CollectionViewController.xib; sourceTree = ""; }; + AD065F0323A030F000CE9835 /* FastConstraints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FastConstraints.swift; sourceTree = ""; }; + AD065F0523A06AF200CE9835 /* CommentsCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentsCollectionViewCell.swift; sourceTree = ""; }; + AD065F0623A06AF200CE9835 /* CommentsCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CommentsCollectionViewCell.xib; sourceTree = ""; }; + AD065F0923A084F800CE9835 /* ShowPostViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShowPostViewController.swift; sourceTree = ""; }; + AD065F0A23A084F800CE9835 /* ShowPostViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShowPostViewController.xib; sourceTree = ""; }; + AD065F0E23A0875C00CE9835 /* PreviewViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PreviewViewController.xib; sourceTree = ""; }; + AD065F1123A09C0100CE9835 /* PreviewViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewViewController.swift; sourceTree = ""; }; + AD065F1323A0A02200CE9835 /* FiltersCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiltersCollectionViewCell.swift; sourceTree = ""; }; + AD065F1423A0A02200CE9835 /* FiltersCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FiltersCollectionViewCell.xib; sourceTree = ""; }; CCC6C6EA9D17CA169951A745 /* Pods-fakestagram.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fakestagram.release.xcconfig"; path = "Target Support Files/Pods-fakestagram/Pods-fakestagram.release.xcconfig"; sourceTree = ""; }; DB68F7FEC717545506064663 /* Pods-fakestagram.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fakestagram.debug.xcconfig"; path = "Target Support Files/Pods-fakestagram/Pods-fakestagram.debug.xcconfig"; sourceTree = ""; }; E023A5532380859200B13B7D /* NotificationKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationKeys.swift; sourceTree = ""; }; @@ -97,8 +119,6 @@ E0C93E9823514D8800FD330C /* posts.successful.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = posts.successful.json; sourceTree = ""; }; E0C93E9A23515A0400FD330C /* show_post.successful.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = show_post.successful.json; sourceTree = ""; }; E0C93E9C23515CEE00FD330C /* CodableSerializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableSerializer.swift; sourceTree = ""; }; - E0C93E9F23523B7C00FD330C /* ShowPostViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowPostViewController.swift; sourceTree = ""; }; - E0C93EA023523B7C00FD330C /* ShowPostViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShowPostViewController.xib; sourceTree = ""; }; E0C93EA32352452900FD330C /* AuthorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorView.swift; sourceTree = ""; }; E0C93EA52352454E00FD330C /* Author.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Author.swift; sourceTree = ""; }; E0C93EA72352455C00FD330C /* Comment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comment.swift; sourceTree = ""; }; @@ -154,6 +174,7 @@ children = ( E045844823762E10006574FA /* CreatePostService.swift */, E0458456237725B9006574FA /* IndexService.swift */, + AD065EFD23A0133D00CE9835 /* ComentsAndLikesServices.swift */, ); path = Services; sourceTree = ""; @@ -228,9 +249,13 @@ E0C185EF237F92C700AD9983 /* PreviewView.swift */, E0A9ED52235A7FF300A0527E /* PostCollectionViewCell.swift */, E0A9ED53235A7FF300A0527E /* PostCollectionViewCell.xib */, - E0C93E9F23523B7C00FD330C /* ShowPostViewController.swift */, - E0C93EA023523B7C00FD330C /* ShowPostViewController.xib */, E0C93EA32352452900FD330C /* AuthorView.swift */, + AD065F0523A06AF200CE9835 /* CommentsCollectionViewCell.swift */, + AD065F0623A06AF200CE9835 /* CommentsCollectionViewCell.xib */, + AD065F0923A084F800CE9835 /* ShowPostViewController.swift */, + AD065F0A23A084F800CE9835 /* ShowPostViewController.xib */, + AD065F1323A0A02200CE9835 /* FiltersCollectionViewCell.swift */, + AD065F1423A0A02200CE9835 /* FiltersCollectionViewCell.xib */, ); path = Views; sourceTree = ""; @@ -238,9 +263,13 @@ E0E25466235B7BCE00C55767 /* ViewControllers */ = { isa = PBXGroup; children = ( + AD065EFF23A02B1200CE9835 /* CollectionViewController.swift */, + AD065F0023A02B1200CE9835 /* CollectionViewController.xib */, E0A9ED50235A782F00A0527E /* PostsViewController.swift */, E038FCEC233FC78600E28571 /* PostViewController.swift */, E0E25462235B675100C55767 /* CameraViewController.swift */, + AD065F1123A09C0100CE9835 /* PreviewViewController.swift */, + AD065F0E23A0875C00CE9835 /* PreviewViewController.xib */, ); path = ViewControllers; sourceTree = ""; @@ -252,6 +281,7 @@ E0E2545E235A9F3A00C55767 /* UIDevice+models.swift */, E0E25464235B6C0500C55767 /* UIImage+Base64.swift */, E023A5532380859200B13B7D /* NotificationKeys.swift */, + AD065F0323A030F000CE9835 /* FastConstraints.swift */, ); path = Utils; sourceTree = ""; @@ -387,8 +417,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E0C93EA223523B7C00FD330C /* ShowPostViewController.xib in Resources */, + AD065F0823A06AF200CE9835 /* CommentsCollectionViewCell.xib in Resources */, E084FAE6233A8735009AC50D /* LaunchScreen.storyboard in Resources */, + AD065F0C23A084F800CE9835 /* ShowPostViewController.xib in Resources */, + AD065F1623A0A02300CE9835 /* FiltersCollectionViewCell.xib in Resources */, + AD065F1023A0875C00CE9835 /* PreviewViewController.xib in Resources */, + AD065F0223A02B1200CE9835 /* CollectionViewController.xib in Resources */, E084FAE3233A8735009AC50D /* Assets.xcassets in Resources */, E084FAE1233A8734009AC50D /* Main.storyboard in Resources */, E0A9ED55235A7FF300A0527E /* PostCollectionViewCell.xib in Resources */, @@ -496,16 +530,20 @@ E0E2545F235A9F3A00C55767 /* UIDevice+models.swift in Sources */, E0E8B96A23481D5A00DA9D1A /* StatusCode.swift in Sources */, E045845123766203006574FA /* CacheImage.swift in Sources */, + AD065F0723A06AF200CE9835 /* CommentsCollectionViewCell.swift in Sources */, + AD065F0123A02B1200CE9835 /* CollectionViewController.swift in Sources */, E045844B237652DD006574FA /* StorageType.swift in Sources */, + AD065EFE23A0133D00CE9835 /* ComentsAndLikesServices.swift in Sources */, E023A5542380859200B13B7D /* NotificationKeys.swift in Sources */, E0C185F0237F92C700AD9983 /* PreviewView.swift in Sources */, E0E8B974234918FF00DA9D1A /* Account.swift in Sources */, - E0C93EA123523B7C00FD330C /* ShowPostViewController.swift in Sources */, E0E25463235B675100C55767 /* CameraViewController.swift in Sources */, E0458457237725B9006574FA /* IndexService.swift in Sources */, + AD065F0B23A084F800CE9835 /* ShowPostViewController.swift in Sources */, E038FCED233FC78600E28571 /* PostViewController.swift in Sources */, E0C93EA82352455C00FD330C /* Comment.swift in Sources */, E0C93EAA2352457200FD330C /* Like.swift in Sources */, + AD065F1523A0A02200CE9835 /* FiltersCollectionViewCell.swift in Sources */, E0C93E9D23515CEE00FD330C /* CodableSerializer.swift in Sources */, E0458454237721F5006574FA /* CheckSum.m in Sources */, E0E25465235B6C0500C55767 /* UIImage+Base64.swift in Sources */, @@ -522,7 +560,9 @@ E045844D23765677006574FA /* DataContainer.swift in Sources */, E0E8B9652348018200DA9D1A /* Credentials.swift in Sources */, E0E8B971234916D100DA9D1A /* RestClient.swift in Sources */, + AD065F0423A030F000CE9835 /* FastConstraints.swift in Sources */, E084FADC233A8734009AC50D /* SceneDelegate.swift in Sources */, + AD065F1223A09C0100CE9835 /* PreviewViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -689,13 +729,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = D3XL2U7DQC; + DEVELOPMENT_TEAM = 4YDAEX93RK; INFOPLIST_FILE = fakestagram/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.3zcurdia.fakestagram; + PRODUCT_BUNDLE_IDENTIFIER = com.3zcurdia.fakestagramjbkj; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "fakestagram/fakestagram-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -711,13 +751,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = D3XL2U7DQC; + DEVELOPMENT_TEAM = 4YDAEX93RK; INFOPLIST_FILE = fakestagram/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.3zcurdia.fakestagram; + PRODUCT_BUNDLE_IDENTIFIER = com.3zcurdia.fakestagramjbkj; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "fakestagram/fakestagram-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/fakestagram/AppDelegate.swift b/fakestagram/AppDelegate.swift index 2660552..7af9ea0 100644 --- a/fakestagram/AppDelegate.swift +++ b/fakestagram/AppDelegate.swift @@ -35,7 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func loadOrCreateAccount() { if Credentials.apiToken.get() != nil { return } - let account = Account(id: nil, name: "Juan Camaney", deviceNumber: UIDevice.identifier, deviceModel: UIDevice.modelName) + let account = Account(id: nil, name: "Pedro Vázquez", deviceNumber: UIDevice.identifier, deviceModel: UIDevice.modelName) let client = RestClient(client: Client.fakestagram, basePath: "/api/v1/accounts") client.create(account) { account in guard let account = account, let idx = account.id else { return } diff --git a/fakestagram/Base.lproj/Main.storyboard b/fakestagram/Base.lproj/Main.storyboard index 469596b..fc54eaf 100644 --- a/fakestagram/Base.lproj/Main.storyboard +++ b/fakestagram/Base.lproj/Main.storyboard @@ -2,13 +2,13 @@ - + - + @@ -17,7 +17,7 @@ - + @@ -46,16 +46,16 @@ - + - + - + @@ -64,10 +64,10 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fakestagram/Views/CommentsCollectionViewCell.swift b/fakestagram/Views/CommentsCollectionViewCell.swift new file mode 100644 index 0000000..54e66b8 --- /dev/null +++ b/fakestagram/Views/CommentsCollectionViewCell.swift @@ -0,0 +1,19 @@ +// +// CommentsCollectionViewCell.swift +// fakestagram +// +// Created by Pedro Antonio Vazquez Rodriguez on 10/12/19. +// Copyright © 2019 3zcurdia. All rights reserved. +// + +import UIKit + +class CommentsCollectionViewCell: UICollectionViewCell { + + static let identifier: String = "CommentCell" + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/fakestagram/Views/CommentsCollectionViewCell.xib b/fakestagram/Views/CommentsCollectionViewCell.xib new file mode 100644 index 0000000..126aa24 --- /dev/null +++ b/fakestagram/Views/CommentsCollectionViewCell.xib @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. + + + + + + + + + + + + + + + + + + + + + diff --git a/fakestagram/Views/FiltersCollectionViewCell.swift b/fakestagram/Views/FiltersCollectionViewCell.swift new file mode 100644 index 0000000..a6c5c31 --- /dev/null +++ b/fakestagram/Views/FiltersCollectionViewCell.swift @@ -0,0 +1,76 @@ +// +// FiltersCollectionViewCell.swift +// fakestagram +// +// Created by Pedro Antonio Vazquez Rodriguez on 10/12/19. +// Copyright © 2019 3zcurdia. All rights reserved. +// + +import UIKit + +class FiltersCollectionViewCell: UICollectionViewCell { + static let identifier: String = "FilterCell" + + @IBOutlet weak var previewImageView: UIImageView! + @IBOutlet weak var titleLabel: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + var currentImage : UIImage! + var context :CIContext! + var currentFilter: CIFilter! + var image: UIImage?{ + didSet{ + guard let img = image else {return} + currentImage = img + previewImageView.image = img + let beginImage = CIImage(image: img) + currentFilter.setValue(beginImage, forKey: kCIInputImageKey) + previewProcessing() + //applyProcessing() + } + } + + var filterString: String?{ + didSet{ + guard let filter = filterString else {return} + context = CIContext() + currentFilter = CIFilter(name: filter) + print(filter) + titleLabel.text = filter +// previewProcessing() + } + + } + + + func previewProcessing() { + let inputKeys = currentFilter.inputKeys + if inputKeys.contains(kCIInputIntensityKey){ + currentFilter.setValue(0.5, forKey: kCIInputIntensityKey) + } + if inputKeys.contains(kCIInputRadiusKey){ + + currentFilter.setValue(0.5 * 300, forKey: kCIInputRadiusKey) + } + if inputKeys.contains(kCIInputScaleKey){ + currentFilter.setValue(0.5 * 15, forKey: kCIInputScaleKey) + } + if inputKeys.contains(kCIInputCenterKey){ + currentFilter.setValue(CIVector(x: currentImage.size.width/2, y: currentImage.size.height/2), forKey: kCIInputCenterKey) + } + + guard let outputImage = currentFilter.outputImage else {return} + + + if let cgImage = context.createCGImage(outputImage, from: outputImage.extent){ + let proceedImage = UIImage(cgImage: cgImage) + previewImageView.image = proceedImage + } + } + +} + + + diff --git a/fakestagram/Views/FiltersCollectionViewCell.xib b/fakestagram/Views/FiltersCollectionViewCell.xib new file mode 100644 index 0000000..eb0221e --- /dev/null +++ b/fakestagram/Views/FiltersCollectionViewCell.xib @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fakestagram/Views/PostCollectionViewCell.swift b/fakestagram/Views/PostCollectionViewCell.swift index 1d5be7b..69bf92f 100644 --- a/fakestagram/Views/PostCollectionViewCell.swift +++ b/fakestagram/Views/PostCollectionViewCell.swift @@ -9,6 +9,8 @@ import UIKit class PostCollectionViewCell: UICollectionViewCell { + + weak var delegate:PostsViewController? static let identifier: String = "PostCell" public var post: Post? { didSet { @@ -21,6 +23,8 @@ class PostCollectionViewCell: UICollectionViewCell { @IBOutlet weak var titleLabel: UILabel! @IBOutlet weak var likeBttn: UIButton! @IBOutlet weak var commentBttn: UIButton! + @IBOutlet weak var commentCounter: UILabel! + func reset() { self.imageView.image = nil @@ -34,9 +38,36 @@ class PostCollectionViewCell: UICollectionViewCell { self.authorView.author = post.author self.titleLabel.text = post.title self.likeCounter.text = post.likesCountText() + self.commentCounter.text = post.commentsCountText() post.load { [unowned self] img in self.imageView.image = img } } + + + + + @IBAction func likeAction(_ sender: UIButton) { + + let service = AddLikeService() + service.call(postId: post?.id) { (post) in + print("success") + } + + } + + @IBAction func commentAction(_ sender: UIButton) { + + let comentsCollectionView = CollectionViewController(collectionViewLayout: UICollectionViewLayout()) +// let navigation = UINavigationController(rootViewController: comentsCollectionView) +// delegate?.present(navigation, animated: true, completion: nil) + delegate?.navigationController?.pushViewController(comentsCollectionView, animated: true) + + + + print("comment") + } + + } diff --git a/fakestagram/Views/PostCollectionViewCell.xib b/fakestagram/Views/PostCollectionViewCell.xib index afff929..db5a89b 100644 --- a/fakestagram/Views/PostCollectionViewCell.xib +++ b/fakestagram/Views/PostCollectionViewCell.xib @@ -1,8 +1,8 @@ - + - + @@ -31,18 +31,30 @@ - + + -