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.

Sign up for GitHub

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

Jump to bottom

fix: 다크 모드 시에 문구 삭제 (#474) #479

Closed
wants to merge 20 commits into from
Closed

fix: 다크 모드 시에 문구 삭제 (#474) #479

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6877a7f
fix: 명함만들기 뷰 아이콘 크기 수정 (#471)
hyun99999 May 2, 2023
d73285c
fix: 명함 뒷면 tmi 폰트 색상 변경 (#472)
hyun99999 May 2, 2023
a774356
fix: 바텀시트 내려가는 속도 조절 (#473)
hyun99999 May 2, 2023
ec11950
fix: 다크 모드 시에 문구 삭제 (#474)
hyun99999 May 2, 2023
4c98987
feat: 매개면수 수정 (#470)
hyun99999 May 3, 2023
2d34b7e
fix: 매개변수 수정 및 widgetURL 수정 (#470)
hyun99999 May 3, 2023
5d6aaed
feat: 내 명함/qr코드 위젯을 통해 앱에서 기능 구현 (#470)
hyun99999 May 4, 2023
4fddc68
feat: 명함 조회 후 명함공유 바텀시트 등장 (#470)
hyun99999 May 4, 2023
5a97fbe
feat: 테스트플라이트용 위젯 수정
dlwns33 May 4, 2023
cf478d0
Merge branch 'feature/justincase' of https://github.com/dlwns33/NADA-…
hyun99999 May 4, 2023
b698648
chore: pod update (#470)
hyun99999 May 4, 2023
ca4640e
fix: 온보딩, 액세스 토큰 UserDefaults key 변경 (#489)
hyun99999 May 4, 2023
da90192
feat: 앱 런치 시 위젯 접근 감지 (#470)
hyun99999 May 4, 2023
2fb88f1
add: 위젯 관련 UserDefaults key 추가 (#470)
hyun99999 May 4, 2023
e90f8d1
feat: 홈에서 위젯을 통해 QR 스캔 화면전환 (#470)
hyun99999 May 5, 2023
7756e62
feat: 홈에서 위젯을 통해 명함 공유 화면전환 (#470)
hyun99999 May 5, 2023
b58adf3
feat: UserDefaults 를 활용해서 업데이트 판단 후에 위젯통해서 접근 구현 (#470)
hyun99999 May 5, 2023
277ba6e
delete: 기본동작에서 서버통신 삭제 (#470)
hyun99999 May 6, 2023
8ef3792
refactor: 내 명함 목록 선택 구현 리펙토링 (#470)
hyun99999 May 6, 2023
ec7cf65
feat: 위젯 기본값 설정 구현 (#470)
hyun99999 May 6, 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
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extension BackCardCell {
tmiTitleLabel.textColor = .white

tmiLabel.font = .textRegular04
tmiLabel.textColor = .background
tmiLabel.textColor = .white
tmiLabel.numberOfLines = 0
}

Expand Down
2 changes: 1 addition & 1 deletion ...OS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class AddGroupBottomSheetViewController: CommonBottomSheetViewController, UIText
let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height
let bottomPadding = view.safeAreaInsets.bottom
bottomSheetViewTopConstraint?.constant = safeAreaHeight + bottomPadding
UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: {
UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseOut, animations: {
self.dimmedBackView.alpha = 0.0
self.view.layoutIfNeeded()
self.bottomSheetCoverView.isHidden = false
Expand Down
2 changes: 1 addition & 1 deletion ...-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class CommonBottomSheetViewController: UIViewController {
let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height
let bottomPadding = view.safeAreaInsets.bottom
bottomSheetViewTopConstraint.constant = safeAreaHeight + bottomPadding
UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: {
UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseOut, animations: {
self.dimmedBackView.alpha = 0.0
self.view.layoutIfNeeded()
self.bottomSheetCoverView.isHidden = false
Expand Down
2 changes: 1 addition & 1 deletion ...rRelease/Sources/ViewControllers/BottomSheet/GroupNameEditBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class GroupNameEditBottomSheetViewController: CommonBottomSheetViewController, U
let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height
let bottomPadding = view.safeAreaInsets.bottom
bottomSheetViewTopConstraint?.constant = safeAreaHeight + bottomPadding
UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: {
UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseOut, animations: {
self.dimmedBackView.alpha = 0.0
self.view.layoutIfNeeded()
self.bottomSheetCoverView.isHidden = false
Expand Down
12 changes: 12 additions & 0 deletions ...rRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ extension CardCreationCategoryViewController {
basicBackgroundView.backgroundColor = .cardCreationUnclicked
companyBackgroundView.backgroundColor = .cardCreationUnclicked
fanBackgroundView.backgroundColor = .cardCreationUnclicked

if UITraitCollection.current.userInterfaceStyle == .light {
contentTextlabel.isHidden = false
checkMarkImageView.isHidden = false
} else {
contentTextlabel.isHidden = true
checkMarkImageView.isHidden = true
}

}

private func setAddTargets() {
Expand Down Expand Up @@ -265,6 +274,7 @@ extension CardCreationCategoryViewController {
make.trailing.equalToSuperview().inset(24)
make.top.equalToSuperview().inset(11)
make.bottom.equalToSuperview().inset(9)
make.width.equalTo(basicImageView.snp.height).multipliedBy(118.0 / 97.0)
}

fanBackgroundView.snp.makeConstraints { make in
Expand All @@ -282,6 +292,7 @@ extension CardCreationCategoryViewController {
make.trailing.equalToSuperview().inset(24)
make.top.equalToSuperview().inset(11)
make.bottom.equalToSuperview().inset(9)
make.width.equalTo(fanImageView.snp.height).multipliedBy(118.0 / 97.0)
}

companyBackgroundView.snp.makeConstraints { make in
Expand All @@ -299,6 +310,7 @@ extension CardCreationCategoryViewController {
make.trailing.equalToSuperview().inset(24)
make.top.equalToSuperview().inset(11)
make.bottom.equalToSuperview().inset(9)
make.width.equalTo(companyImageView.snp.height).multipliedBy(118.0 / 97.0)
}

checkMarkImageView.snp.makeConstraints { make in
Expand Down