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] 프로필 수정 뷰 수정사항 반영 #532

Merged
merged 24 commits into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7ec3b69
➕ Add: 프로필 수정 버튼 추가 (#509)
jane1choi Oct 8, 2022
b9d3237
✅ Chore: 프로필 수정 뷰 기본 UI 수정사항 반영 (#509)
jane1choi Oct 8, 2022
ad050b5
✨ Feat: 프로필 수정 한줄소개 글자수 표시 기능 구현 (#509)
jane1choi Oct 10, 2022
93767e1
✅ Chore: 바텀시트 높이 커스텀 가능하도록 코드 수정 (#509)
jane1choi Oct 10, 2022
d0d5f80
✨ Feat: 프로필 이미지 변경 바텀시트 디폴트 UI 구성 (#509)
jane1choi Oct 10, 2022
a5d3a04
✅ Chore: 제2전공 선택 시 미진입 옵션 처리 위한 코드 수정 (#509)
jane1choi Oct 11, 2022
85c9a19
✨ Feat: 바텀시트 호출 프로필 수정 뷰, 학과 리스트로 분기처리 (#509)
jane1choi Oct 11, 2022
58e9fc2
⏪️ Rename: @IBAction 네이밍 수정 (#509)
jane1choi Oct 11, 2022
80a12c8
✅ Chore: 컨벤션에 맞도록 함수 위치 조정 (#509)
jane1choi Oct 11, 2022
10606e6
✅ Chore: univID에 맞는 학과무관 majorID 보내도록 수정 (#509)
jane1choi Oct 11, 2022
98ab550
✅ Chore: 홈탭 엑세스토큰 갱신 처리 (#509)
dev-jungbin Oct 11, 2022
06c1529
✅ Chore: 마이페이지탭 엑세스토큰 갱신 처리 (#509)
dev-jungbin Oct 11, 2022
49e0181
✅ Chore: 알림탭 엑세스토큰 갱신 처리 (#509)
dev-jungbin Oct 11, 2022
2fe293f
Revert "✅ Chore: 알림탭 엑세스토큰 갱신 처리 (#509)"
dev-jungbin Oct 11, 2022
ade5916
Revert "✅ Chore: 마이페이지탭 엑세스토큰 갱신 처리 (#509)"
dev-jungbin Oct 11, 2022
733ed78
Revert "✅ Chore: 홈탭 엑세스토큰 갱신 처리 (#509)"
dev-jungbin Oct 11, 2022
687fac7
➕ Add: 이미지 에셋 추가 (#509)
jane1choi Oct 13, 2022
9ca2dcf
✅ Chore: 함수 문서화 주석 수정 (#509)
jane1choi Oct 13, 2022
2eeef96
🚚 Move: 이미지 에셋 폴더링 수정 (#509)
jane1choi Oct 13, 2022
82a1b0d
✅ Chore: 프로필 수정 뷰 디폴트 UI 수정 (#509)
jane1choi Oct 13, 2022
860aa81
✅ Chore: 선택완료 버튼 조건 설정 (#509)
jane1choi Oct 13, 2022
ad1362a
✨ Feat: 버튼 액션 설정 및 데이터 전달 구현 (#509)
jane1choi Oct 13, 2022
c139720
Merge remote-tracking branch 'origin/chore/#509-UI-Mypage-EditProfile…
jane1choi Oct 13, 2022
e9e7efe
✅ Chore: 이미지 변경 및 리뷰반영한 코드 수정 (#509)
jane1choi Oct 15, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ class HalfModalVC: UIViewController {
// MARK: Properties
private var majorList: [MajorInfoModel] = []
private var filteredList: [MajorInfoModel] = []
var secondMajorList: [MajorInfoModel] = []
var dataSource: UITableViewDiffableDataSource<Section, MajorInfoModel>!
var snapshot: NSDiffableDataSourceSnapshot<Section, MajorInfoModel>!
var selectMajorDelegate: SendUpdateModalDelegate?
var selectFilterDelegate: SendUpdateStatusDelegate?
var vcType: ModalType = .basic
var cellType: MajorCellType = .basic
var hasNoMajorOption: Bool = true
var isSecondMajorSheet: Bool = false

// MARK: Life Cycle
override func viewDidLoad() {
Expand Down Expand Up @@ -214,7 +216,7 @@ extension HalfModalVC {

/// 0번째 인덱스 셀이 초기 선택되도록하는 메서드
private func setUpDefaultStatus() {
if majorList[0].majorName == "학과 무관" {
if majorList[0].majorName == "학과 무관" || majorList[0].majorName == "미진입" {
self.majorTV.selectRow(at: IndexPath(row: 0, section: 0), animated: false, scrollPosition: .none)
completeBtn.isActivated = true
completeBtn.titleLabel?.textColor = UIColor.mainDefault
Expand All @@ -225,6 +227,9 @@ extension HalfModalVC {
private func setUpMajorList(hasNoMajorOption: Bool) {
if hasNoMajorOption {
majorList = MajorInfo.shared.majorList ?? []
if isSecondMajorSheet {
majorList = secondMajorList
}
} else {
var classroomList = MajorInfo.shared.majorList
classroomList?.remove(at: 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ extension MajorTVC {
/// Label에 학과 이름 setting하는 함수
func setData(majorName: MajorInfoModel) {
majorNameLabel.text = majorName.majorName
starBtn.isHidden = majorName.majorName == "학과 무관" ? true : false
starBtn.isHidden = majorName.majorName == "학과 무관" || majorName.majorName == "미진입" ? true : false
}

func setMajorNameLabel(data: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ final class CommunityWriteVC: BaseWritePostVC, View {
var disposeBag = DisposeBag()
var isEditState: Bool = false
var postID: Int?
var majorID: Int = 128
var majorID: Int = MajorInfo.shared.majorList?[0].majorID ?? 0
var categoryIndex: Int?
var originTitle: String?
var originContent: String?
Expand Down Expand Up @@ -349,6 +349,6 @@ extension CommunityWriteVC: UIViewControllerTransitioningDelegate {
extension CommunityWriteVC: SendUpdateModalDelegate {
func sendUpdate(data: Any) {
majorSelectTextField.text = data as? String
majorID = MajorInfo.shared.selectedMajorID ?? 128
majorID = MajorInfo.shared.selectedMajorID ?? 0
}
}

Large diffs are not rendered by default.

Loading