Skip to content

Commit

Permalink
[FEAT] TeamNADA#68 - 리스트뷰, 탭바, 카드뒷면 수정 완료
Browse files Browse the repository at this point in the history
  • Loading branch information
@mini-min
mini-min committed Nov 18, 2021
1 parent 4496c40 commit 0094b0d
Show file tree
Hide file tree
Showing 13 changed files with 313 additions and 303 deletions.
16 changes: 16 additions & 0 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 390515B72706CEBB00C5F7A5 /* Colors.xcassets */; };
3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3909242E26FA15E800236C51 /* UIView+Extension.swift */; };
39288E12273F52B20072F403 /* CardListLookUpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39288E11273F52B20072F403 /* CardListLookUpRequest.swift */; };
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */; };
392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */; };
39488E352706E17200BDC917 /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */; };
394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394F314B27081B3A00C83291 /* FrontViewController.swift */; };
394F314F27081B4C00C83291 /* Front.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 394F314E27081B4C00C83291 /* Front.storyboard */; };
Expand Down Expand Up @@ -94,6 +96,8 @@
390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
39288E11273F52B20072F403 /* CardListLookUpRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListLookUpRequest.swift; sourceTree = "<group>"; };
392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreListTableViewCell.swift; sourceTree = "<group>"; };
392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreListTableViewCell.xib; sourceTree = "<group>"; };
39488E342706E17200BDC917 /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = "<group>"; };
394F314B27081B3A00C83291 /* FrontViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontViewController.swift; sourceTree = "<group>"; };
394F314E27081B4C00C83291 /* Front.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Front.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -195,6 +199,15 @@
path = Pods;
sourceTree = "<group>";
};
392F7FB1274621CF008CDBF5 /* MoreList */ = {
isa = PBXGroup;
children = (
392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */,
392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */,
);
path = MoreList;
sourceTree = "<group>";
};
394F314A2708157500C83291 /* Main */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -527,6 +540,7 @@
F8FC439B26C01EC30033E151 /* Cells */ = {
isa = PBXGroup;
children = (
392F7FB1274621CF008CDBF5 /* MoreList */,
F84BAFA126FDB4E5004CA335 /* CreationCard */,
39523E582701A47400536900 /* CardList */,
F83206AC26F61E5800D61711 /* CardCell */,
Expand Down Expand Up @@ -712,6 +726,7 @@
39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */,
39523E0B270184B100536900 /* CardList.storyboard in Resources */,
F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */,
392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */,
390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -830,6 +845,7 @@
F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */,
F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */,
F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */,
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */,
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */,
F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */,
F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */,
Expand Down
65 changes: 0 additions & 65 deletions NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,67 +10,6 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lgy-Hk-Rnf">
<rect key="frame" x="28" y="69" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="RBf-Ky-DHo"/>
<constraint firstAttribute="width" secondItem="lgy-Hk-Rnf" secondAttribute="height" id="cBY-TA-Nai"/>
</constraints>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" image="arrowBackWhite">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="리스트" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WSB-Wx-Jzl">
<rect key="frame" x="72" y="67" width="68" height="32"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="26"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="T3m-AC-fcX">
<rect key="frame" x="0.0" y="126" width="375" height="652"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="separatorColor" red="0.1764705882352941" green="0.1764705882352941" blue="0.1764705882352941" alpha="1" colorSpace="calibratedRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<color key="sectionIndexBackgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9r1-kP-Lgu">
<rect key="frame" x="0.0" y="125" width="375" height="1"/>
<color key="backgroundColor" name="black5"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Nns-gn-uHB"/>
</constraints>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="WSB-Wx-Jzl" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="23" id="0hJ-g2-MU9"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="9r1-kP-Lgu" secondAttribute="trailing" id="4fU-0h-0EB"/>
<constraint firstItem="9r1-kP-Lgu" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="B19-Hv-G1e"/>
<constraint firstItem="lgy-Hk-Rnf" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="28" id="B8X-eH-xhw"/>
<constraint firstItem="lgy-Hk-Rnf" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="25" id="C0T-wZ-eqo"/>
<constraint firstItem="T3m-AC-fcX" firstAttribute="top" secondItem="WSB-Wx-Jzl" secondAttribute="bottom" constant="27" id="CyX-fp-vib"/>
<constraint firstItem="T3m-AC-fcX" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="E4W-Ke-YqM"/>
<constraint firstItem="T3m-AC-fcX" firstAttribute="top" secondItem="9r1-kP-Lgu" secondAttribute="bottom" id="UlC-ol-x58"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="T3m-AC-fcX" secondAttribute="trailing" id="dlD-OW-QE5"/>
<constraint firstItem="WSB-Wx-Jzl" firstAttribute="leading" secondItem="lgy-Hk-Rnf" secondAttribute="trailing" constant="20" id="egP-Mf-usK"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="T3m-AC-fcX" secondAttribute="bottom" id="pk7-m1-pre"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="44" y="83.497536945812811"/>
</scene>
<!--Card List View Controller-->
<scene sceneID="jHI-XV-01Y">
<objects>
Expand Down Expand Up @@ -137,14 +76,10 @@
</scene>
</scenes>
<resources>
<image name="arrowBackWhite" width="24" height="24"/>
<image name="iconArrow" width="24" height="24"/>
<namedColor name="background">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="black5">
<color red="0.054901960784313725" green="0.054901960784313725" blue="0.054901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
Expand Down
13 changes: 5 additions & 8 deletions NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G4S-UU-Nlv" customClass="VerticalCardSwiper" customModule="VerticalCardSwiper">
<rect key="frame" x="0.0" y="94" width="375" height="718"/>
<rect key="frame" x="0.0" y="94" width="375" height="635"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
Expand All @@ -75,12 +75,10 @@
<constraint firstItem="FvW-XO-xRq" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" id="aUZ-9B-MHj"/>
<constraint firstItem="G4S-UU-Nlv" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="cDg-sT-T2P"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="FvW-XO-xRq" secondAttribute="trailing" id="jxE-l0-mQp"/>
<constraint firstAttribute="bottom" secondItem="G4S-UU-Nlv" secondAttribute="bottom" id="ni7-jU-JdH"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="G4S-UU-Nlv" secondAttribute="bottom" id="ni7-jU-JdH"/>
</constraints>
</view>
<tabBarItem key="tabBarItem" title="" image="iconHome" selectedImage="iconHomeSelected" id="KGr-aG-jdG">
<offsetWrapper key="titlePositionAdjustment" horizontal="0.0" vertical="0.0"/>
</tabBarItem>
<tabBarItem key="tabBarItem" title="" image="iconHome" selectedImage="iconHomeSelected" id="trK-km-n7M"/>
<navigationItem key="navigationItem" id="cZk-R4-laO"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections>
Expand All @@ -91,11 +89,11 @@
</objects>
<point key="canvasLocation" x="970.39999999999998" y="34.729064039408868"/>
</scene>
<!--Home-->
<!--Navigation Controller-->
<scene sceneID="Iry-nU-jak">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="HRL-Ko-Eah" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Home" image="homeBtnOnClick" id="VDP-2f-dqN"/>
<tabBarItem key="tabBarItem" title="" landscapeImage="iconHome" selectedImage="iconHomeSelected" id="VDP-2f-dqN"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="SGQ-gu-e0K">
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -111,7 +109,6 @@
</scene>
</scenes>
<resources>
<image name="homeBtnOnClick" width="30" height="30"/>
<image name="iconAdd" width="30" height="30"/>
<image name="iconHome" width="30" height="30"/>
<image name="iconHomeSelected" width="30" height="35"/>
Expand Down
Loading

0 comments on commit 0094b0d

Please sign in to comment.