diff --git a/Fakestagram-Xcode10/Fakestagram-Xcode10/Assets.xcassets/AppIcon.appiconset/Contents 2.json b/Fakestagram-Xcode10/Fakestagram-Xcode10/Assets.xcassets/AppIcon.appiconset/Contents 2.json new file mode 100644 index 0000000..d8db8d6 --- /dev/null +++ b/Fakestagram-Xcode10/Fakestagram-Xcode10/Assets.xcassets/AppIcon.appiconset/Contents 2.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file 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/Assets.xcassets/AppIcon.appiconset/Contents 2.json b/fakestagram/Assets.xcassets/AppIcon.appiconset/Contents 2.json new file mode 100644 index 0000000..d8db8d6 --- /dev/null +++ b/fakestagram/Assets.xcassets/AppIcon.appiconset/Contents 2.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/fakestagram/Assets.xcassets/Contents 2.json b/fakestagram/Assets.xcassets/Contents 2.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/fakestagram/Assets.xcassets/Contents 2.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/fakestagram/Assets.xcassets/approval.imageset/Contents 2.json b/fakestagram/Assets.xcassets/approval.imageset/Contents 2.json new file mode 100644 index 0000000..869caf9 --- /dev/null +++ b/fakestagram/Assets.xcassets/approval.imageset/Contents 2.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "approval.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "approval@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "approval@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/fakestagram/Assets.xcassets/approval.imageset/approval@3x 2.png b/fakestagram/Assets.xcassets/approval.imageset/approval@3x 2.png new file mode 100644 index 0000000..c0cc5e2 Binary files /dev/null and b/fakestagram/Assets.xcassets/approval.imageset/approval@3x 2.png differ diff --git a/fakestagram/Base.lproj/LaunchScreen 2.storyboard b/fakestagram/Base.lproj/LaunchScreen 2.storyboard new file mode 100644 index 0000000..865e932 --- /dev/null +++ b/fakestagram/Base.lproj/LaunchScreen 2.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fakestagram/Base.lproj/Main 2.storyboard b/fakestagram/Base.lproj/Main 2.storyboard new file mode 100644 index 0000000..469596b --- /dev/null +++ b/fakestagram/Base.lproj/Main 2.storyboard @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fakestagram/Views/PostCollectionViewCell.swift b/fakestagram/Views/PostCollectionViewCell.swift index 1d5be7b..c2814b1 100644 --- a/fakestagram/Views/PostCollectionViewCell.swift +++ b/fakestagram/Views/PostCollectionViewCell.swift @@ -15,6 +15,8 @@ class PostCollectionViewCell: UICollectionViewCell { updateView() } } + + @IBOutlet weak var authorView: AuthorView! @IBOutlet weak var imageView: UIImageView! @IBOutlet weak var likeCounter: UILabel! @@ -38,5 +40,7 @@ class PostCollectionViewCell: UICollectionViewCell { self.imageView.image = img } } - + @IBAction func Hola(_ sender: Any) { + print("Hola") + } } diff --git a/fakestagram/Views/PostCollectionViewCell.xib b/fakestagram/Views/PostCollectionViewCell.xib index afff929..a511296 100644 --- a/fakestagram/Views/PostCollectionViewCell.xib +++ b/fakestagram/Views/PostCollectionViewCell.xib @@ -1,13 +1,13 @@ - + - + - + @@ -36,6 +36,9 @@ + diff --git a/fakestagramTests/Info 2.plist b/fakestagramTests/Info 2.plist new file mode 100644 index 0000000..64d65ca --- /dev/null +++ b/fakestagramTests/Info 2.plist @@ -0,0 +1,22 @@ + + + + + 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 + +