Skip to content

Commit

Permalink
Merge pull request #170 from TeamNADA/release1.0/#169
Browse files Browse the repository at this point in the history
[FIX] #169 - 명함생성뷰 플레이스홀더 변경 및 상태바 위치 조절
  • Loading branch information
hyun99999 authored Dec 20, 2021
2 parents 7be83d5 + aa76a1a commit 9dda016
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ extension FrontCardCreationCollectionViewCell {
instagramIDTextField.attributedPlaceholder = NSAttributedString(string: "Instagram (@ 제외)", attributes: [
NSAttributedString.Key.foregroundColor: UIColor.quaternary
])
linkURLTextField.attributedPlaceholder = NSAttributedString(string: "URL (Github, Blog)", attributes: [
linkURLTextField.attributedPlaceholder = NSAttributedString(string: "URL (Github, Blog)", attributes: [
NSAttributedString.Key.foregroundColor: UIColor.quaternary
])
descriptionTextField.attributedPlaceholder = NSAttributedString(string: "동아리 기수 / 파트 (15자)", attributes: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ extension CardCreationViewController: UICollectionViewDelegate {
func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
let targetIndex = targetContentOffset.pointee.x / scrollView.frame.size.width
if targetIndex == 1 && currentIndex == 0 {
UIView.animate(withDuration: 0.2) {
self.statusMovedView.transform = CGAffineTransform(translationX: self.backTextLabel.frame.origin.x - self.statusMovedView.frame.origin.x + 5, y: 0)
UIView.animate(withDuration: 0.3) {
self.statusMovedView.transform = CGAffineTransform(translationX: self.backTextLabel.frame.origin.x - self.statusMovedView.frame.origin.x - 5, y: 0)
}
currentIndex = 1
self.frontTextLabel.textColor = .quaternary
Expand Down

0 comments on commit 9dda016

Please sign in to comment.