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

프로젝트 매니저 [STEP 2] Zion, karen #317

Open
wants to merge 28 commits into
base: ic_9_zion94
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d8669fd
feat: Cell, TaskViewController 구현 및 프로젝트 기초 구성 구현
LeeZion94 Oct 3, 2023
9c67f84
feat: ListViewController 레이아웃 구현
Oct 3, 2023
f803ddd
feat: ListViewController DiffableDataSource 적용
LeeZion94 Oct 3, 2023
eb6c675
feat: MainViewController 레이아웃 구현
Oct 3, 2023
39b8121
feat: Task 생성시 MainViewController에서 ListViewController를 갱신하도록 변경
LeeZion94 Oct 3, 2023
549bf84
fix: 불필요 타입 삭제
LeeZion94 Oct 3, 2023
f91a534
feat: taskCountLabel 라운딩 적용
Oct 5, 2023
c37229d
feat: shadow적용
Oct 5, 2023
34238a3
feat: Task Update로직 추가
LeeZion94 Oct 5, 2023
386a36e
feat: deadline에 따른 텍스트 색상변경 적용
Oct 5, 2023
5acaed5
feat: isPassDeadline 로직 수정
LeeZion94 Oct 5, 2023
eb4c7ae
fix: descriptionLabel 줄 수 제한 적용
Oct 5, 2023
1118c27
feat: swipeDelete 로직추가
LeeZion94 Oct 5, 2023
353c110
feat: trailingAction 적용
Oct 5, 2023
2d97e3d
feat: Cell Move 로직추가
LeeZion94 Oct 5, 2023
7f1c36f
fix: Section 갱신로직 수정
LeeZion94 Oct 6, 2023
c3d1160
feat: showToast 로직 추가
LeeZion94 Oct 6, 2023
4a0ff41
feat: MainViewController UseCase 생성
LeeZion94 Oct 6, 2023
7cf5bf1
refactor: 불필요한 컨벤션 삭제, 네이밍 수정
Oct 8, 2023
7240a33
feat: descriptionTextView글자수 제한 적용
Oct 8, 2023
e090224
refactor: listKind -> TaskStatus로 수정
LeeZion94 Oct 8, 2023
28957b6
refactor: deleteTask 중복 노출 수정
LeeZion94 Oct 8, 2023
2933395
feat: ListViewControllerUseCase 생성
LeeZion94 Oct 8, 2023
01c3cf6
fix: 제목만 들어간 경우 titleLoad 불가 수정
LeeZion94 Oct 8, 2023
0787d98
fix: TextView 영역을 벗어나서 노출되는 텍스트 안보이도록 수정
LeeZion94 Oct 8, 2023
9adceec
refactor: argument label to로 수정
Oct 8, 2023
076b3e0
refactor: convertTitle부분 UseCase로 옮김
LeeZion94 Oct 8, 2023
587b1f6
Update README.md
karenyang835 Oct 9, 2023
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
112 changes: 104 additions & 8 deletions ProjectManager/ProjectManager.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,34 @@
objects = {

/* Begin PBXBuildFile section */
5B1666B32ACBD8DB00478F1D /* TaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1666B22ACBD8DB00478F1D /* TaskViewController.swift */; };
5B1666B62ACBE99300478F1D /* Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1666B52ACBE99300478F1D /* Task.swift */; };
5B1666B82ACBEB7100478F1D /* ListCollectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1666B72ACBEB7100478F1D /* ListCollectionHeaderView.swift */; };
5B1666DE2ACEDDC000478F1D /* AlertControllerShowable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1666DD2ACEDDC000478F1D /* AlertControllerShowable.swift */; };
5B9D60322ACBD4E9004905F6 /* ListCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B9D60312ACBD4E9004905F6 /* ListCollectionViewCell.swift */; };
5BD9FD652ACFD8A700EE70B7 /* ToastShowable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD9FD642ACFD8A700EE70B7 /* ToastShowable.swift */; };
5BD9FD682ACFDCCF00EE70B7 /* MainViewControllerUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD9FD672ACFDCCF00EE70B7 /* MainViewControllerUseCase.swift */; };
9C4F6E812ACBE29700FDC393 /* ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4F6E802ACBE29700FDC393 /* ListViewController.swift */; };
C7431F0625F51E1D0094C4CF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7431F0525F51E1D0094C4CF /* AppDelegate.swift */; };
C7431F0825F51E1D0094C4CF /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7431F0725F51E1D0094C4CF /* SceneDelegate.swift */; };
C7431F0A25F51E1D0094C4CF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7431F0925F51E1D0094C4CF /* ViewController.swift */; };
C7431F0A25F51E1D0094C4CF /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7431F0925F51E1D0094C4CF /* MainViewController.swift */; };
C7431F0F25F51E1E0094C4CF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C7431F0E25F51E1E0094C4CF /* Assets.xcassets */; };
C7431F1225F51E1E0094C4CF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C7431F1025F51E1E0094C4CF /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
5B1666B22ACBD8DB00478F1D /* TaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskViewController.swift; sourceTree = "<group>"; };
5B1666B52ACBE99300478F1D /* Task.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Task.swift; sourceTree = "<group>"; };
5B1666B72ACBEB7100478F1D /* ListCollectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListCollectionHeaderView.swift; sourceTree = "<group>"; };
5B1666DD2ACEDDC000478F1D /* AlertControllerShowable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertControllerShowable.swift; sourceTree = "<group>"; };
5B9D60312ACBD4E9004905F6 /* ListCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListCollectionViewCell.swift; sourceTree = "<group>"; };
5BD9FD642ACFD8A700EE70B7 /* ToastShowable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastShowable.swift; sourceTree = "<group>"; };
5BD9FD672ACFDCCF00EE70B7 /* MainViewControllerUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewControllerUseCase.swift; sourceTree = "<group>"; };
9C4F6E802ACBE29700FDC393 /* ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListViewController.swift; sourceTree = "<group>"; };
C7431F0225F51E1D0094C4CF /* ProjectManager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ProjectManager.app; sourceTree = BUILT_PRODUCTS_DIR; };
C7431F0525F51E1D0094C4CF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C7431F0725F51E1D0094C4CF /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
C7431F0925F51E1D0094C4CF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
C7431F0925F51E1D0094C4CF /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
C7431F0E25F51E1E0094C4CF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
C7431F1125F51E1E0094C4CF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
C7431F1325F51E1E0094C4CF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -35,6 +51,76 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
5B1666B42ACBE98400478F1D /* Model */ = {
isa = PBXGroup;
children = (
5B1666B52ACBE99300478F1D /* Task.swift */,
);
path = Model;
sourceTree = "<group>";
};
5B1666DB2ACEDDA800478F1D /* Util */ = {
isa = PBXGroup;
children = (
5B1666DC2ACEDDB300478F1D /* Protocol */,
);
path = Util;
sourceTree = "<group>";
};
5B1666DC2ACEDDB300478F1D /* Protocol */ = {
isa = PBXGroup;
children = (
5B1666DD2ACEDDC000478F1D /* AlertControllerShowable.swift */,
5BD9FD642ACFD8A700EE70B7 /* ToastShowable.swift */,
);
path = Protocol;
sourceTree = "<group>";
};
5B9D602D2ACBD462004905F6 /* App */ = {
isa = PBXGroup;
children = (
C7431F0525F51E1D0094C4CF /* AppDelegate.swift */,
C7431F0725F51E1D0094C4CF /* SceneDelegate.swift */,
);
path = App;
sourceTree = "<group>";
};
5B9D602E2ACBD464004905F6 /* Controller */ = {
isa = PBXGroup;
children = (
C7431F0925F51E1D0094C4CF /* MainViewController.swift */,
5B1666B22ACBD8DB00478F1D /* TaskViewController.swift */,
9C4F6E802ACBE29700FDC393 /* ListViewController.swift */,
);
path = Controller;
sourceTree = "<group>";
};
5B9D602F2ACBD467004905F6 /* Resource */ = {
isa = PBXGroup;
children = (
C7431F0E25F51E1E0094C4CF /* Assets.xcassets */,
);
path = Resource;
sourceTree = "<group>";
};
5B9D60302ACBD469004905F6 /* View */ = {
isa = PBXGroup;
children = (
C7431F1025F51E1E0094C4CF /* LaunchScreen.storyboard */,
5B9D60312ACBD4E9004905F6 /* ListCollectionViewCell.swift */,
5B1666B72ACBEB7100478F1D /* ListCollectionHeaderView.swift */,
);
path = View;
sourceTree = "<group>";
};
5BD9FD662ACFDCBE00EE70B7 /* UseCase */ = {
isa = PBXGroup;
children = (
5BD9FD672ACFDCCF00EE70B7 /* MainViewControllerUseCase.swift */,
);
path = UseCase;
sourceTree = "<group>";
};
C7431EF925F51E1D0094C4CF = {
isa = PBXGroup;
children = (
Expand All @@ -54,12 +140,14 @@
C7431F0425F51E1D0094C4CF /* ProjectManager */ = {
isa = PBXGroup;
children = (
C7431F0525F51E1D0094C4CF /* AppDelegate.swift */,
C7431F0725F51E1D0094C4CF /* SceneDelegate.swift */,
C7431F0925F51E1D0094C4CF /* ViewController.swift */,
C7431F0E25F51E1E0094C4CF /* Assets.xcassets */,
C7431F1025F51E1E0094C4CF /* LaunchScreen.storyboard */,
C7431F1325F51E1E0094C4CF /* Info.plist */,
5BD9FD662ACFDCBE00EE70B7 /* UseCase */,
5B1666DB2ACEDDA800478F1D /* Util */,
5B1666B42ACBE98400478F1D /* Model */,
5B9D60302ACBD469004905F6 /* View */,
5B9D602F2ACBD467004905F6 /* Resource */,
5B9D602E2ACBD464004905F6 /* Controller */,
5B9D602D2ACBD462004905F6 /* App */,
);
path = ProjectManager;
sourceTree = "<group>";
Expand Down Expand Up @@ -133,9 +221,17 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C7431F0A25F51E1D0094C4CF /* ViewController.swift in Sources */,
5BD9FD652ACFD8A700EE70B7 /* ToastShowable.swift in Sources */,
5B1666DE2ACEDDC000478F1D /* AlertControllerShowable.swift in Sources */,
5B1666B62ACBE99300478F1D /* Task.swift in Sources */,
C7431F0A25F51E1D0094C4CF /* MainViewController.swift in Sources */,
5BD9FD682ACFDCCF00EE70B7 /* MainViewControllerUseCase.swift in Sources */,
C7431F0625F51E1D0094C4CF /* AppDelegate.swift in Sources */,
5B9D60322ACBD4E9004905F6 /* ListCollectionViewCell.swift in Sources */,
C7431F0825F51E1D0094C4CF /* SceneDelegate.swift in Sources */,
5B1666B82ACBEB7100478F1D /* ListCollectionHeaderView.swift in Sources */,
5B1666B32ACBD8DB00478F1D /* TaskViewController.swift in Sources */,
9C4F6E812ACBE29700FDC393 /* ListViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ import UIKit

@main
class AppDelegate: UIResponder, UIApplicationDelegate {



func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
Expand All @@ -29,7 +26,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
}


}

Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import UIKit
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
var window: UIWindow?


func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
guard let windowScene = (scene as? UIWindowScene) else { return }
let viewController = ViewController()
let useCase: MainViewControllerUseCaseType = MainViewControllerUseCase()
let mainViewController = MainViewController(useCase: useCase)
let navigationController = UINavigationController(rootViewController: mainViewController)

window = UIWindow(windowScene: windowScene)
window?.rootViewController = viewController
window?.rootViewController = navigationController
window?.makeKeyAndVisible()
}

Expand Down
Loading