Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] #36 - 인증사진 모아보기 뷰 레이아웃 구현 #41

Merged
merged 18 commits into from
Jan 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 53 additions & 10 deletions Spark-iOS/Spark-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
EB625E84278F273200C43DE9 /* FailStorageCVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB625E82278F273200C43DE9 /* FailStorageCVC.xib */; };
EB625E87278F27F000C43DE9 /* StorageListDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB625E86278F27F000C43DE9 /* StorageListDataModel.swift */; };
EB625E8A278F29D300C43DE9 /* CarouselLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB625E89278F29D300C43DE9 /* CarouselLayout.swift */; };
EB625E8F278F8E1900C43DE9 /* StorageMoreListDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB625E8E278F8E1900C43DE9 /* StorageMoreListDataModel.swift */; };
EB625E91278F8E3700C43DE9 /* StorageMoreVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB625E90278F8E3700C43DE9 /* StorageMoreVC.swift */; };
EB625E95278F8E7200C43DE9 /* MoreStorageCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB625E93278F8E7200C43DE9 /* MoreStorageCVC.swift */; };
EB625E96278F8E7200C43DE9 /* MoreStorageCVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB625E94278F8E7200C43DE9 /* MoreStorageCVC.xib */; };
EB625E99278F8EF200C43DE9 /* StorageMore.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EB625E98278F8EF200C43DE9 /* StorageMore.storyboard */; };
EBA77239278A2E14002958A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EBA77238278A2E14002958A5 /* Colors.xcassets */; };
F8096F042784107D00B71D38 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F032784107D00B71D38 /* AppDelegate.swift */; };
F8096F062784107D00B71D38 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F052784107D00B71D38 /* SceneDelegate.swift */; };
Expand All @@ -41,8 +46,6 @@
F8096F3A2784210A00B71D38 /* TempModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F392784210A00B71D38 /* TempModel.swift */; };
F8096F3C2784211D00B71D38 /* UIColor+.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F3B2784211D00B71D38 /* UIColor+.swift */; };
F8096F3E2784213700B71D38 /* UIFont+.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F3D2784213700B71D38 /* UIFont+.swift */; };
F8096F402784214000B71D38 /* TempCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F3F2784214000B71D38 /* TempCell.swift */; };
F8096F422784214900B71D38 /* TempAppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F412784214900B71D38 /* TempAppModel.swift */; };
F8096F442784221900B71D38 /* Xib.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F432784221900B71D38 /* Xib.swift */; };
F8096F462784247100B71D38 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F452784247100B71D38 /* Notification.swift */; };
F80A3E4D278C182100728E07 /* MainTabBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F80A3E4C278C182100728E07 /* MainTabBar.storyboard */; };
Expand Down Expand Up @@ -84,6 +87,11 @@
EB625E82278F273200C43DE9 /* FailStorageCVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FailStorageCVC.xib; sourceTree = "<group>"; };
EB625E86278F27F000C43DE9 /* StorageListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageListDataModel.swift; sourceTree = "<group>"; };
EB625E89278F29D300C43DE9 /* CarouselLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselLayout.swift; sourceTree = "<group>"; };
EB625E8E278F8E1900C43DE9 /* StorageMoreListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageMoreListDataModel.swift; sourceTree = "<group>"; };
EB625E90278F8E3700C43DE9 /* StorageMoreVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageMoreVC.swift; sourceTree = "<group>"; };
EB625E93278F8E7200C43DE9 /* MoreStorageCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreStorageCVC.swift; sourceTree = "<group>"; };
EB625E94278F8E7200C43DE9 /* MoreStorageCVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreStorageCVC.xib; sourceTree = "<group>"; };
EB625E98278F8EF200C43DE9 /* StorageMore.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = StorageMore.storyboard; sourceTree = "<group>"; };
EBA77238278A2E14002958A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
F8096F002784107D00B71D38 /* Spark-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Spark-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
F8096F032784107D00B71D38 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -102,8 +110,6 @@
F8096F392784210A00B71D38 /* TempModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempModel.swift; sourceTree = "<group>"; };
F8096F3B2784211D00B71D38 /* UIColor+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+.swift"; sourceTree = "<group>"; };
F8096F3D2784213700B71D38 /* UIFont+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+.swift"; sourceTree = "<group>"; };
F8096F3F2784214000B71D38 /* TempCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempCell.swift; sourceTree = "<group>"; };
F8096F412784214900B71D38 /* TempAppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempAppModel.swift; sourceTree = "<group>"; };
F8096F432784221900B71D38 /* Xib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Xib.swift; sourceTree = "<group>"; };
F8096F452784247100B71D38 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
F80A3E4C278C182100728E07 /* MainTabBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainTabBar.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -171,6 +177,7 @@
isa = PBXGroup;
children = (
EB625E86278F27F000C43DE9 /* StorageListDataModel.swift */,
EB625E8E278F8E1900C43DE9 /* StorageMoreListDataModel.swift */,
);
path = StorageList;
sourceTree = "<group>";
Expand All @@ -183,6 +190,31 @@
path = Classes;
sourceTree = "<group>";
};
EB625E8B278F8D5400C43DE9 /* StorageMore */ = {
isa = PBXGroup;
children = (
EB625E90278F8E3700C43DE9 /* StorageMoreVC.swift */,
);
path = StorageMore;
sourceTree = "<group>";
};
EB625E92278F8E4700C43DE9 /* StorageMoreCVC */ = {
isa = PBXGroup;
children = (
EB625E93278F8E7200C43DE9 /* MoreStorageCVC.swift */,
EB625E94278F8E7200C43DE9 /* MoreStorageCVC.xib */,
);
path = StorageMoreCVC;
sourceTree = "<group>";
};
EB625E97278F8ED200C43DE9 /* StorageMore */ = {
isa = PBXGroup;
children = (
EB625E98278F8EF200C43DE9 /* StorageMore.storyboard */,
);
path = StorageMore;
sourceTree = "<group>";
};
F8096EF72784107D00B71D38 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -275,6 +307,7 @@
F82B2E0F278F54B000219628 /* Splash */,
F816F120278E1C550008ED00 /* Login */,
F80A3E59278C239F00728E07 /* TabBar */,
EB625E97278F8ED200C43DE9 /* StorageMore */,
);
path = Storyboards;
sourceTree = "<group>";
Expand All @@ -301,6 +334,7 @@
F82B2E10278F54C200219628 /* Splash */,
F816F123278E1C800008ED00 /* Login */,
F80A3E58278C22BA00728E07 /* TabBar */,
EB625E8B278F8D5400C43DE9 /* StorageMore */,
);
path = ViewControllers;
sourceTree = "<group>";
Expand Down Expand Up @@ -347,6 +381,7 @@
2B69E7E4278E22F4000F927F /* FeedHeaderView.swift */,
2B69E7E6278E28B2000F927F /* FeedCVC.swift */,
EB625E68278ECF6E00C43DE9 /* StorageCVC */,
EB625E92278F8E4700C43DE9 /* StorageMoreCVC */,
);
path = Cells;
sourceTree = "<group>";
Expand Down Expand Up @@ -478,6 +513,7 @@
files = (
EB625E84278F273200C43DE9 /* FailStorageCVC.xib in Resources */,
F80A3E4D278C182100728E07 /* MainTabBar.storyboard in Resources */,
EB625E96278F8E7200C43DE9 /* MoreStorageCVC.xib in Resources */,
F8096F102784107E00B71D38 /* LaunchScreen.storyboard in Resources */,
F816F122278E1C760008ED00 /* Login.storyboard in Resources */,
2B9471F9278BE922005484C5 /* NotoSansKR-Bold.otf in Resources */,
Expand All @@ -493,6 +529,7 @@
EB625E7C278F271400C43DE9 /* DoingStorageCVC.xib in Resources */,
F8096F0D2784107E00B71D38 /* Assets.xcassets in Resources */,
2B947205278CB00E005484C5 /* Futura Bold.otf in Resources */,
EB625E99278F8EF200C43DE9 /* StorageMore.storyboard in Resources */,
EB625E80278F272300C43DE9 /* DoneStorageCVC.xib in Resources */,
F8FAA9732790344D00C4190F /* HomeHabitCVC.xib in Resources */,
F8096F0B2784107D00B71D38 /* Home.storyboard in Resources */,
Expand Down Expand Up @@ -550,16 +587,16 @@
files = (
2BC1726D278E8F1000BA3029 /* UIView+.swift in Sources */,
F8FAA9722790344D00C4190F /* HomeHabitCVC.swift in Sources */,
F8096F422784214900B71D38 /* TempAppModel.swift in Sources */,
F82B2E0B278EBC4400219628 /* UserDefaultsKey.swift in Sources */,
EB625E91278F8E3700C43DE9 /* StorageMoreVC.swift in Sources */,
F8096F3227841FE100B71D38 /* ViewController.swift in Sources */,
F8096F042784107D00B71D38 /* AppDelegate.swift in Sources */,
2B69E7E5278E22F4000F927F /* FeedHeaderView.swift in Sources */,
F80A3E55278C1C1F00728E07 /* StorageVC.swift in Sources */,
F8096F3A2784210A00B71D38 /* TempModel.swift in Sources */,
EB625E7F278F272300C43DE9 /* DoneStorageCVC.swift in Sources */,
F8096F3C2784211D00B71D38 /* UIColor+.swift in Sources */,
F867B6B6278F86610024B1D4 /* UINavigationController+.swift in Sources */,
EB625E7F278F272300C43DE9 /* DoneStorageCVC.swift in Sources */,
F8096F34278420F100B71D38 /* TempView.swift in Sources */,
2B69E7E7278E28B2000F927F /* FeedCVC.swift in Sources */,
F8096F2B27841F4100B71D38 /* Storyboard.swift in Sources */,
Expand All @@ -573,9 +610,11 @@
F816F125278E1C920008ED00 /* LoginVC.swift in Sources */,
F8096F382784210000B71D38 /* TempService.swift in Sources */,
F8096F3E2784213700B71D38 /* UIFont+.swift in Sources */,
EB625E95278F8E7200C43DE9 /* MoreStorageCVC.swift in Sources */,
F82B2E12278F54CD00219628 /* SplashVC.swift in Sources */,
F8096F2927841F1E00B71D38 /* Const.swift in Sources */,
F8096F3027841F9200B71D38 /* HomeVC.swift in Sources */,
EB625E8F278F8E1900C43DE9 /* StorageMoreListDataModel.swift in Sources */,
F8096F462784247100B71D38 /* Notification.swift in Sources */,
F8FAA9762790346000C4190F /* HomeWaitingCVC.swift in Sources */,
EB625E87278F27F000C43DE9 /* StorageListDataModel.swift in Sources */,
Expand Down Expand Up @@ -728,9 +767,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Spark-iOS/Spark-iOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = T8C9SSEX5G;
DEVELOPMENT_TEAM = FY8N9XTH66;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Spark-iOS/Resource/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Spark;
Expand All @@ -745,8 +785,9 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.TeamSparker.Spark;
PRODUCT_BUNDLE_IDENTIFIER = com.TeamSparker.Sparks;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand All @@ -760,9 +801,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Spark-iOS/Spark-iOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = T8C9SSEX5G;
DEVELOPMENT_TEAM = FY8N9XTH66;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Spark-iOS/Resource/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Spark;
Expand All @@ -777,8 +819,9 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.TeamSparker.Spark;
PRODUCT_BUNDLE_IDENTIFIER = com.TeamSparker.Sparks;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "bgLinegridForBlack.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Spark-iOS/Spark-iOS/Resource/Constants/Storyboard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ extension Const {
static let home = "Home"
static let feed = "Feed"
static let storage = "Storage"
static let storageMore = "StorageMore"
static let login = "Login"
static let splash = "Splash"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Storage MoreVC-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="StorageMoreVC" id="Y6W-OH-hqX" customClass="StorageMoreVC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bgLinegridForBlack" translatesAutoresizingMaskIntoConstraints="NO" id="CnB-Ou-x6s">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="CnB-Ou-x6s" secondAttribute="trailing" id="Xh8-h2-Yat"/>
<constraint firstItem="CnB-Ou-x6s" firstAttribute="top" secondItem="5EZ-qb-Rvc" secondAttribute="top" id="eFJ-nc-629"/>
<constraint firstItem="CnB-Ou-x6s" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="jul-Iy-BnV"/>
<constraint firstAttribute="bottom" secondItem="CnB-Ou-x6s" secondAttribute="bottom" id="xio-tr-ibZ"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="25" y="76"/>
</scene>
</scenes>
<resources>
<image name="bgLinegridForBlack" width="375" height="812"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//
// StorageMoreListDataModel.swift
// Spark-iOS
//
// Created by Junho Lee on 2022/01/13.
//

import Foundation
12 changes: 0 additions & 12 deletions Spark-iOS/Spark-iOS/Source/Cells/StorageCVC/DoingStorageCVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,3 @@ class DoingStorageCVC: UICollectionViewCell {
gradationUIView.setGradient(color1: UIColor.clear, color2: UIColor.black)
}
}

extension UIView{
func setGradient(color1:UIColor,color2:UIColor){
let gradient: CAGradientLayer = CAGradientLayer()
gradient.colors = [color1.cgColor,color2.cgColor]
gradient.locations = [0.0 , 1.0]
gradient.startPoint = CGPoint(x: 1.0, y: 0.8)
gradient.endPoint = CGPoint(x: 1.0, y: 0.0)
gradient.frame = bounds
layer.addSublayer(gradient)
}
}
Loading