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

Refactor/#171: 디자인 컴포넌트 1차 정리 완료 #174

Merged
merged 50 commits into from
Feb 10, 2023
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8e5f1fa
refactor: NavigationHeaderView setNavigationTitleLabelAttribute 메서드 초…
dev-muuu Feb 4, 2023
6df6682
#165: BaseLeftVC, BaseCenterVC 제거
dev-muuu Feb 4, 2023
ee8a952
feat: UITableView extension 메서드 cellForRow 추가 > 자동 타입 캐스팅 진행후 cell 반환
dev-muuu Feb 5, 2023
04d4cdb
fix: BaseTableViewCell cellIdentifier 자동 설정으로 인한 기존 cellIdentifier 제거
dev-muuu Feb 5, 2023
3059e66
#172: CategoryBottomSheet appear/disappear에 따른 arrow 조절 RxSwift로 구현
dev-muuu Feb 5, 2023
2eb3e1e
choret: RxGesture 라이브러리 추가
dev-muuu Feb 5, 2023
fa34616
#172: ProductNameTabeViewCell RxSwift 통한 textField 값 변경 감지
dev-muuu Feb 5, 2023
5a2511b
refactor: HeaderNavigationTitle 생성자 요구 추가 및 레이아웃 설정 메서드 클래스 내부 구현으로 변경
dev-muuu Feb 5, 2023
d99c767
chore: ViewModel 디렉토리 네이밍 도메인+ViewModels > 도메인 네임
dev-muuu Feb 5, 2023
c65ece9
#172: 재치 등록 데이터 수집 위한 ZatchRegisterRequestManager 클래스 생성
dev-muuu Feb 5, 2023
ca9ea9a
#172: ZatchRegisterFirstVC ZatchFirstInput 제거 > ZatchRegisterRequestM…
dev-muuu Feb 5, 2023
99100f6
feat: BaseTableViewCell selectedBackgroundView 설정
dev-muuu Feb 6, 2023
87755b1
refactor: FirstProductInfoTableView cellType 메서드로 적용
dev-muuu Feb 6, 2023
98399ac
#172: nextButton RxSwift tap 적용
dev-muuu Feb 6, 2023
32045e7
#172: ZatchRegisterSecondVC tableView cellType 메서드로 적용
dev-muuu Feb 6, 2023
3a4764c
feat: ZatchDateFormatter 추가 및 baseFormatter 설정
dev-muuu Feb 6, 2023
f65d9f8
refactor: UICollectionView dequeueReusableCell(cellType:) 메서드 cellTyp…
dev-muuu Feb 6, 2023
849df0a
refactor: AlertViewController confirmHandler > completion 네이밍 변경
dev-muuu Feb 6, 2023
957fb4c
#172: 이미지 View 재사용 위한 네이밍 변경 (RegisterImageDetailView > ImageDetailView)
dev-muuu Feb 6, 2023
08bfa1c
#167: ImageAddTableViewCell base 추상 메서드 활용으로 리팩토링
dev-muuu Feb 6, 2023
bd853c4
#165: DeleteImageDetailViewController base 생성자 적용으로 리팩토링
dev-muuu Feb 6, 2023
5fbc232
#165: RegisterImageDetailViewController base 생성자 및 HeaderView 활용으로 리팩토링
dev-muuu Feb 6, 2023
7697c7d
#172: FirstProductInfoTableView tableView 메서드 cellType 적용 및 Base 추상 메…
dev-muuu Feb 6, 2023
bc5272a
#171: ZatchComponent 디렉토리 및 extension 위한 클래스 생성
dev-muuu Feb 8, 2023
903ba03
#171: 디자인 컴포넌트 '글자와 화살표' > LettersAndArrowView 생성
dev-muuu Feb 8, 2023
a0b41eb
chore: 이전 컴포넌트 디렉토리 정리(제거 예정)
dev-muuu Feb 8, 2023
bd66001
#171: 필터링 View 컴포넌트 생성
dev-muuu Feb 9, 2023
33b9f94
#172: CategorySheetViewController completion 반환 타입 Int (기존 카테고리 이름 & …
dev-muuu Feb 10, 2023
657c883
#172: CategorySelectTableViewCell > RegisterCategorySelectTableViewCe…
dev-muuu Feb 10, 2023
ec81f4e
#172: RegisterCategorySelectTableViewCell isSubViewOpen 프로퍼티 통한 arrow…
dev-muuu Feb 10, 2023
ed8b2f6
#172: RegisterCategorySelectTableViewCell 카테고리 네임 지정 메서드 생성 (id값 전달 통…
dev-muuu Feb 10, 2023
a4e78c3
#172: ZatchRegisterFirstVC cellIndex 상수 프로퍼티 선언 통해 tableView interact…
dev-muuu Feb 10, 2023
b7a54ad
#172: ZatchRegisterFirstVC tableView didSelectRowAt 메서드 리팩토링 > 함수 단위로…
dev-muuu Feb 10, 2023
0c94fe4
#172: RegisterCategorySelectView View 클래스 분리
dev-muuu Feb 10, 2023
425e5f9
#172: RegisterCategorySelectTableViewCell의 view 프로퍼티로 RegisterCategor…
dev-muuu Feb 10, 2023
7f290c2
#172: RegisterCategorySelectWithRankTableViewCell mainView로 RegisterC…
dev-muuu Feb 10, 2023
17aa582
#172: FirstProductInfoTableView > ProductDetailInputTableViewCell 네이밍 변경
dev-muuu Feb 10, 2023
1070d51
#172: RegisterImageDetailViewController 생성자 매개변수로 이미지 데이터 넘기기
dev-muuu Feb 10, 2023
8749cab
#172: 이미지 등록/삭제 ViewController image 초기화 코드 작성 메서드 style > initialize 변경
dev-muuu Feb 10, 2023
5c15736
#172: ProductDateChoiceTableViewCell 파일 분리
dev-muuu Feb 10, 2023
7cd2f59
#172: ProductDate 열거형과 ProductDateChoiceTableViewCell setTitle 메서드 사용…
dev-muuu Feb 10, 2023
fb70cb3
refactor: AlertViewController show 메서드 반환 타입 Self 설정
dev-muuu Feb 10, 2023
0f580a4
#172: RegisterCellDelegate 프로토콜 추가 > DatePickerCell 이벤트 발생시 ViewContr…
dev-muuu Feb 10, 2023
be1dc1f
#172: ProductDetailInputTableViewCell DatePicker 이벤트 ViewController에 …
dev-muuu Feb 10, 2023
d213caa
#172: 상품 세부사항 관련 Cell 각각 파일 분리
dev-muuu Feb 10, 2023
6c9a018
#172: ImageAddBtnCollectionViewCell Base 클래스 적용으로 리팩토링
dev-muuu Feb 10, 2023
a5f8309
#172: ImageRegisterCollectionViewCell contentMode 설정
dev-muuu Feb 10, 2023
3305b7f
#171: 라디오버튼 + 타이틀 컴포넌트 > RadioButtonView 생성
dev-muuu Feb 10, 2023
e8b16e1
feat: Const.ViewTag 구조체 생성 > view의 select/unselect 여부 관리 용도
dev-muuu Feb 10, 2023
ea16c61
#172: ZatchRegisterSecondVC RadioButtonView 적용 및 RxSwift 통한 tapGestur…
dev-muuu Feb 10, 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
Next Next commit
refactor: NavigationHeaderView setNavigationTitleLabelAttribute 메서드 초…
…기 구현 및 적용
  • Loading branch information
dev-muuu committed Feb 4, 2023
commit 8e5f1fa5e84b8048d7a697e412b61cb24ae1d087
Original file line number Diff line number Diff line change
@@ -8,10 +8,9 @@
import Foundation

class CenterNavigationHeaderView: BaseHeaderView, HeaderNavigationTitle{

let title: String
let navigationTitleLabel = UILabel().then{
$0.font = UIFont.pretendard(size: 20, family: .Bold)
}
let navigationTitleLabel = UILabel()

init(title: String){
self.title = title
@@ -23,7 +22,7 @@ class CenterNavigationHeaderView: BaseHeaderView, HeaderNavigationTitle{
}

override func style() {
navigationTitleLabel.text = title
setNavigationTitleLabelAttribute(typo: .bold20)
}

override func layout() {
Original file line number Diff line number Diff line change
@@ -10,10 +10,8 @@ import Foundation
class LeftNavigationHeaderView: BaseHeaderView, HeaderNavigationTitle{

internal let title: String
let navigationTitleLabel = UILabel().then{
$0.font = UIFont.pretendard(size: 20, family: .Bold)
}

let navigationTitleLabel = UILabel()

init(title: String){
self.title = title
super.init(frame: .zero)
@@ -24,7 +22,7 @@ class LeftNavigationHeaderView: BaseHeaderView, HeaderNavigationTitle{
}

override func style() {
navigationTitleLabel.text = title
setNavigationTitleLabelAttribute(typo: .bold20)
}

override func layout() {
5 changes: 5 additions & 0 deletions Zatch/Global/Source/Protocol/HeaderProtocol.swift
Original file line number Diff line number Diff line change
@@ -49,6 +49,11 @@ protocol HeaderNavigationTitle{

extension HeaderNavigationTitle{

func setNavigationTitleLabelAttribute(typo: TypoStyle){
navigationTitleLabel.text = title
navigationTitleLabel.setTypoStyleWithSingleLine(typoStyle: typo)
}

func layoutNavigationTitle() where Self: CenterNavigationHeaderView{
self.addSubview(navigationTitleLabel)
navigationTitleLabel.snp.makeConstraints{
23 changes: 11 additions & 12 deletions Zatch/Presentation/ViewControllers/Main/MainViewController.swift
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ class MainViewController: BaseTabBarViewController<MainHeaderView>{
action: #selector(townBottomSheetWillShow)))

headerView.secondEtcButton.addTarget(self, action: #selector(goSearchButtonDidTap), for: .touchUpInside)
// headerView.etcButton.addTarget(self, action: #selector(goNotiButtonDidTap), for: .touchUpInside)
headerView.etcButton.addTarget(self, action: #selector(goNotiButtonDidTap), for: .touchUpInside)
}

override func bind(){
@@ -151,22 +151,21 @@ extension MainViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let tag = indexPath.row
switch tag {
// case 0:
// let vc = ResultSearchViewController()
// self.navigationController?.pushViewController(vc, animated: true)
// break
// case 2:
// let vc = FirstRegisterViewController()
// self.navigationController?.pushViewController(vc, animated: true)
// break
case 0:
let vc = ResultSearchViewController()
self.navigationController?.pushViewController(vc, animated: true)
break
case 2:
let vc = ZatchRegisterFirstViewController()
self.navigationController?.pushViewController(vc, animated: true)
break
default:
return
}
tableView.deselectRow(at: indexPath, animated: true)
}
}

// MARK: - 메인페이지의 콜렉션뷰를 갖고있는 테이블뷰의 CollectionView delegate
extension MainViewController: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return 7
@@ -178,7 +177,7 @@ extension MainViewController: UICollectionViewDelegate, UICollectionViewDataSour
return cell
}
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
// let vc = ZatchDetailViewController()
// self.navigationController?.pushViewController(vc, animated: true)
let vc = ZatchDetailViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
}