Skip to content

Commit

Permalink
Merge pull request TeamNADA#79 from mini-min/feature/TeamNADA#74
Browse files Browse the repository at this point in the history 
[FEAT] TeamNADA#74 - 리스트뷰, 더보기뷰, 그룹 편집뷰 세부 구현
  • Loading branch information
@mini-min
mini-min authored Nov 25, 2021
2 parents 1543bee + dae8a41 commit db378fa
Show file tree
Hide file tree
Showing 24 changed files with 637 additions and 94 deletions.
41 changes: 40 additions & 1 deletion NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
39369937274A4FCB00684420 /* NotoSansCJKkr-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369932274A4FCB00684420 /* NotoSansCJKkr-Medium.otf */; };
39369938274A4FCB00684420 /* Spoqa Han Sans Neo Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369933274A4FCB00684420 /* Spoqa Han Sans Neo Bold.otf */; };
39369939274A4FCB00684420 /* Spoqa Han Sans Neo Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369934274A4FCB00684420 /* Spoqa Han Sans Neo Regular.otf */; };
3936993B274A53C600684420 /* GroupEdit.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3936993A274A53C600684420 /* GroupEdit.storyboard */; };
3936993E274A53E000684420 /* GroupEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3936993D274A53E000684420 /* GroupEditViewController.swift */; };
39369944274A568900684420 /* GroupEditTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39369942274A568900684420 /* GroupEditTableViewCell.swift */; };
39369945274A568900684420 /* GroupEditTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39369943274A568900684420 /* GroupEditTableViewCell.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 All @@ -33,7 +37,9 @@
3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3979709726FA0BF0003FB4F5 /* Login.storyboard */; };
3981148E273BEBB300E28630 /* CardListEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3981148D273BEBB300E28630 /* CardListEditRequest.swift */; };
39811490273BEBCE00E28630 /* CardListRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3981148F273BEBCE00E28630 /* CardListRequest.swift */; };
398413B7274A7A1E005550BC /* AddGroupBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398413B6274A7A1E005550BC /* AddGroupBottomSheetViewController.swift */; };
399C55DF2711949D00845A54 /* CGPoint+Distance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399C55DE2711949D00845A54 /* CGPoint+Distance.swift */; };
39A8DEA3274E6436005DE7C8 /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39A8DEA2274E6436005DE7C8 /* UITextField+Extension.swift */; };
39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */; };
39D13565273FDB9C00B1A148 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D13564273FDB9C00B1A148 /* User.swift */; };
39D13568273FDCB800B1A148 /* UserWithTokenRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D13567273FDCB800B1A148 /* UserWithTokenRequest.swift */; };
Expand Down Expand Up @@ -111,6 +117,10 @@
39369932274A4FCB00684420 /* NotoSansCJKkr-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansCJKkr-Medium.otf"; sourceTree = "<group>"; };
39369933274A4FCB00684420 /* Spoqa Han Sans Neo Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Spoqa Han Sans Neo Bold.otf"; sourceTree = "<group>"; };
39369934274A4FCB00684420 /* Spoqa Han Sans Neo Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Spoqa Han Sans Neo Regular.otf"; sourceTree = "<group>"; };
3936993A274A53C600684420 /* GroupEdit.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = GroupEdit.storyboard; sourceTree = "<group>"; };
3936993D274A53E000684420 /* GroupEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditViewController.swift; sourceTree = "<group>"; };
39369942274A568900684420 /* GroupEditTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditTableViewCell.swift; sourceTree = "<group>"; };
39369943274A568900684420 /* GroupEditTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupEditTableViewCell.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 All @@ -126,7 +136,9 @@
3979709726FA0BF0003FB4F5 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
3981148D273BEBB300E28630 /* CardListEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListEditRequest.swift; sourceTree = "<group>"; };
3981148F273BEBCE00E28630 /* CardListRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListRequest.swift; sourceTree = "<group>"; };
398413B6274A7A1E005550BC /* AddGroupBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupBottomSheetViewController.swift; sourceTree = "<group>"; };
399C55DE2711949D00845A54 /* CGPoint+Distance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGPoint+Distance.swift"; sourceTree = "<group>"; };
39A8DEA2274E6436005DE7C8 /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = "<group>"; };
39C1E88E270EC762006D2089 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = "<group>"; };
39D13564273FDB9C00B1A148 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
39D13567273FDCB800B1A148 /* UserWithTokenRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserWithTokenRequest.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -224,6 +236,23 @@
path = MoreList;
sourceTree = "<group>";
};
3936993C274A53D300684420 /* GroupEdit */ = {
isa = PBXGroup;
children = (
3936993D274A53E000684420 /* GroupEditViewController.swift */,
);
path = GroupEdit;
sourceTree = "<group>";
};
3936993F274A565E00684420 /* GroupEdit */ = {
isa = PBXGroup;
children = (
39369942274A568900684420 /* GroupEditTableViewCell.swift */,
39369943274A568900684420 /* GroupEditTableViewCell.xib */,
);
path = GroupEdit;
sourceTree = "<group>";
};
394F314A2708157500C83291 /* Main */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -277,6 +306,7 @@
isa = PBXGroup;
children = (
3958F23B270FFBD500B100B2 /* Group.storyboard */,
3936993A274A53C600684420 /* GroupEdit.storyboard */,
);
path = Group;
sourceTree = "<group>";
Expand Down Expand Up @@ -326,6 +356,7 @@
isa = PBXGroup;
children = (
39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */,
398413B6274A7A1E005550BC /* AddGroupBottomSheetViewController.swift */,
);
path = BottomSheet;
sourceTree = "<group>";
Expand Down Expand Up @@ -571,6 +602,7 @@
F8FC439B26C01EC30033E151 /* Cells */ = {
isa = PBXGroup;
children = (
3936993F274A565E00684420 /* GroupEdit */,
392F7FB1274621CF008CDBF5 /* MoreList */,
F84BAFA126FDB4E5004CA335 /* CreationCard */,
39523E582701A47400536900 /* CardList */,
Expand Down Expand Up @@ -619,6 +651,7 @@
F8FC43A026C01F040033E151 /* ViewControllers */ = {
isa = PBXGroup;
children = (
3936993C274A53D300684420 /* GroupEdit */,
39D88B692746009B00A72164 /* BottomSheet */,
39D88B682745FE6C00A72164 /* TabBar */,
394F314A2708157500C83291 /* Main */,
Expand Down Expand Up @@ -672,6 +705,7 @@
children = (
3909242E26FA15E800236C51 /* UIView+Extension.swift */,
39488E342706E17200BDC917 /* UIAlertController+Extension.swift */,
39A8DEA2274E6436005DE7C8 /* UITextField+Extension.swift */,
39007F2B27080D8200E7143E /* UIViewController+Extension.swift */,
39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */,
39C1E88E270EC762006D2089 /* UIColor+Extension.swift */,
Expand Down Expand Up @@ -753,7 +787,9 @@
F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */,
394F314F27081B4C00C83291 /* Front.storyboard in Resources */,
3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */,
39369945274A568900684420 /* GroupEditTableViewCell.xib in Resources */,
F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */,
3936993B274A53C600684420 /* GroupEdit.storyboard in Resources */,
39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */,
39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */,
F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */,
Expand Down Expand Up @@ -840,11 +876,12 @@
F8C83FCB272FA32C0009DF0D /* GroupService.swift in Sources */,
F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */,
F8C83FBD272F9F430009DF0D /* GenericResponse.swift in Sources */,
398413B7274A7A1E005550BC /* AddGroupBottomSheetViewController.swift in Sources */,
39007F2C27080D8200E7143E /* UIViewController+Extension.swift in Sources */,
F8C83FB6272F9E380009DF0D /* UtilService.swift in Sources */,
3958F239270FFBBF00B100B2 /* GroupViewController.swift in Sources */,
3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */,
F81A6833274F49A700B80A4F /* UITextField+Extension.swift in Sources */,
39A8DEA3274E6436005DE7C8 /* UITextField+Extension.swift in Sources */,
39523E09270184A700536900 /* CardListViewController.swift in Sources */,
F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */,
777FF89B27359B7800BF69D3 /* Groups.swift in Sources */,
Expand All @@ -869,6 +906,7 @@
39D88B5F2745FB7E00A72164 /* MoreViewController.swift in Sources */,
F8FC43B326C020B90033E151 /* BackCardCreationDelegate.swift in Sources */,
39584581273E951C009CC6B9 /* MainListRequest.swift in Sources */,
39369944274A568900684420 /* GroupEditTableViewCell.swift in Sources */,
F8FC43B526C020C10033E151 /* TempViews.swift in Sources */,
F8C83FBB272F9F370009DF0D /* NetworkResult.swift in Sources */,
39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */,
Expand All @@ -887,6 +925,7 @@
F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */,
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */,
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */,
3936993E274A53E000684420 /* GroupEditViewController.swift in Sources */,
F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */,
F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */,
39D13565273FDB9C00B1A148 /* User.swift in Sources */,
Expand Down
2 changes: 2 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ extension Const {
static let cardList = "CardList"
static let front = "Front"
static let group = "Group"
static let groupEdit = "GroupEdit"
static let tabBar = "TabBar"
static let cardCreationPreview = "CardCreationPreview"
static let more = "More"
}

}
Expand Down
3 changes: 3 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ extension Const {
static let cardListViewController = "CardListViewController"
static let frontViewController = "FrontViewController"
static let groupViewController = "GroupViewController"
static let groupEditViewController = "GroupEditViewController"
static let tabBarViewController = "TabBarViewController"
static let commonBottomSheetViewController = "CommonBottomSheetViewController"
static let cardCreationPreviewViewController = "CardCreationPreviewViewController"
static let addGroupBottomSheetViewController = "AddGroupBottomSheetViewController"
static let moreViewController = "MoreViewController"
}
}
}
2 changes: 2 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/Xib.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@ extension Const {
static let frontCardCell = "FrontCardCell"
static let backCardCell = "BackCardCell"
static let backgroundCollectionViewCell = "BackgroundCollectionViewCell"
static let groupEditTableViewCell = "GroupEditTableViewCell"
static let moreListTableViewCell = "MoreListTableViewCell"
}
}
17 changes: 13 additions & 4 deletions NADA-iOS-forRelease/Resouces/Extensions/UITextField+Extension.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@
// UITextField+Extension.swift
// NADA-iOS-forRelease
//
// Created by kimhyungyu on 2021/11/25.
// Created by 민 on 2021/11/24.
//

import Foundation
import UIKit

extension UITextField {
func addLeftPadding() {
let paddingView = UIView(frame: CGRect(x: 0, y: 0, width: 12, height: self.frame.height))
// 왼쪽에 여백 주기
func setLeftPaddingPoints(_ amount: CGFloat) {
let paddingView = UIView(frame: CGRect(x: 0, y: 0, width: amount, height: self.frame.size.height))
self.leftView = paddingView
self.leftViewMode = ViewMode.always
self.leftViewMode = .always
}

// 오른쪽에 여백 주기
func setRightPaddingPoints(_ amount: CGFloat) {
let paddingView = UIView(frame: CGRect(x: 0, y: 0, width: amount, height: self.frame.size.height))
self.rightView = paddingView
self.rightViewMode = .always
}
}
8 changes: 4 additions & 4 deletions NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ extension UIViewController {

let alertViewController = UIAlertController(title: title, message: message, preferredStyle: .alert)

alertViewController.setTitle(font: UIFont.boldSystemFont(ofSize: 17), color: UIColor.white)
alertViewController.setMessage(font: UIFont.systemFont(ofSize: 13), color: UIColor.white)
// alertViewController.setTitle(font: UIFont.boldSystemFont(ofSize: 17), color: UIColor.white)
// alertViewController.setMessage(font: UIFont.systemFont(ofSize: 13), color: UIColor.white)
// alertViewController.setTint(color: .mainBlue)

alertViewController.view.subviews.first?.subviews.first?.subviews.first?.backgroundColor = UIColor(red: 30/255, green: 30/255, blue: 30/255, alpha: 3/4)
// alertViewController.view.subviews.first?.subviews.first?.subviews.first?.backgroundColor = UIColor(red: 30/255, green: 30/255, blue: 30/255, alpha: 3/4)

let cancelAction = UIAlertAction(title: "취소", style: .cancel, handler: cancelAction)
alertViewController.addAction(cancelAction)

let deleteAction = UIAlertAction(title: "삭제", style: .default, handler: deleteAction)
let deleteAction = UIAlertAction(title: "삭제", style: .destructive, handler: deleteAction)
alertViewController.addAction(deleteAction)

self.present(alertViewController, animated: true, completion: completion)
Expand Down
5 changes: 2 additions & 3 deletions NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<!--Card List View Controller-->
<scene sceneID="jHI-XV-01Y">
<objects>
<viewController storyboardIdentifier="CardListViewController" id="hIB-F2-GxN" customClass="CardListViewController" customModule="NADA_iOS_forRelease" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="CardListViewController" hidesBottomBarWhenPushed="YES" id="hIB-F2-GxN" customClass="CardListViewController" customModule="NADA_iOS_forRelease" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="lQI-zS-JVS">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -53,9 +53,8 @@
<constraint firstAttribute="height" constant="50" id="iKb-7D-YhB"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="agd-KH-glE">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" estimatedSectionHeaderHeight="-1" sectionFooterHeight="28" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="agd-KH-glE">
<rect key="frame" x="0.0" y="104" width="375" height="674"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="u4c-Vl-XUk"/>
Expand Down
Loading

0 comments on commit db378fa

Please sign in to comment.