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

🔀 :: (#748) 접근 권한 안내 팝업 변경 #772

Merged
merged 5 commits into from
Jul 12, 2024
Merged

🔀 :: (#748) 접근 권한 안내 팝업 변경 #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fff92e4
💄 :: [#748] 임시 레이아웃
KangTaeHoon Jul 7, 2024
b622d64
💄 :: [#748] 변경된UI 수정
KangTaeHoon Jul 12, 2024
53947cb
💄 :: [#748] 변경된UI 수정 2t
KangTaeHoon Jul 12, 2024
a61cfb3
🎨 :: 코드 Formatting 적용
KangTaeHoon Jul 12, 2024
df3a03a
💄 :: [#748] 네이밍 변경
KangTaeHoon Jul 12, 2024
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
166 changes: 108 additions & 58 deletions Projects/Features/RootFeature/Resources/Intro.storyboard
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 148 additions & 90 deletions Projects/Features/RootFeature/Sources/ViewControllers/PermissionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ public class PermissionViewController: UIViewController, ViewControllerFromStory
@IBOutlet weak var borderView: UIView!
@IBOutlet weak var borderViewWidthConstraint: NSLayoutConstraint!
@IBOutlet weak var mainTitleLabel: UILabel!
@IBOutlet weak var optionalPermissionLabel: UILabel!

@IBOutlet weak var deviceInfoImageView: UIImageView!
@IBOutlet weak var deviceInfoLabel: UILabel!
@IBOutlet weak var deviceInfoDescriptionLabel: UILabel!
@IBOutlet weak var notificationImageView: UIImageView!
@IBOutlet weak var notificationLabel: UILabel!
@IBOutlet weak var notificationDescriptionLabel: UILabel!
@IBOutlet weak var cameraImageView: UIImageView!
@IBOutlet weak var cameraLabel: UILabel!
@IBOutlet weak var cameraDescriptionLabel: UILabel!
Expand Down Expand Up @@ -46,105 +51,129 @@ public class PermissionViewController: UIViewController, ViewControllerFromStory
}
}

extension PermissionViewController {
private func configureUI() {
self.view.backgroundColor = UIColor.black.withAlphaComponent(0.4)
self.borderView.layer.cornerRadius = 24
self.borderView.clipsToBounds = true

let mainTitleAttributedString = NSMutableAttributedString(
string: "앱 접근 권한 안내",
attributes: [
.font: DesignSystemFontFamily.Pretendard.bold.font(size: 22),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color,
.kern: -0.5
]
private extension PermissionViewController {
func configureUI() {
view.backgroundColor = UIColor.black.withAlphaComponent(0.4)
borderView.layer.cornerRadius = 24
borderView.clipsToBounds = true

setAttributedString(
with: mainTitleLabel,
text: "앱 접근 권한 안내",
font: DesignSystemFontFamily.Pretendard.bold.font(size: 22),
textColor: DesignSystemAsset.BlueGrayColor.gray900.color,
lineHeight: 32,
alignment: .center
)
self.mainTitleLabel.attributedText = mainTitleAttributedString

let optionalAttributedString = NSMutableAttributedString(
string: "선택적 접근 권한",
attributes: [
.font: DesignSystemFontFamily.Pretendard.medium.font(size: 18),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color,
.kern: -0.5
]
deviceInfoImageView.image = DesignSystemAsset.Permission.permissionDevice.image
setAttributedString(
with: deviceInfoLabel,
text: "기기정보 (필수)",
font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
textColor: DesignSystemAsset.BlueGrayColor.gray900.color,
lineHeight: 24,
alignment: .left
)
self.optionalPermissionLabel.attributedText = optionalAttributedString

self.cameraImageView.image = DesignSystemAsset.Permission.permissionCamera.image
let cameraAttributedString = NSMutableAttributedString(
string: "카메라",
attributes: [
.font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color,
.kern: -0.5
]
setSubAttributedString(with: deviceInfoLabel, target: "(필수)")

deviceInfoDescriptionLabel.numberOfLines = 0
setAttributedString(
with: deviceInfoDescriptionLabel,
text: "사용성 개선 및 오류 확인",
font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
textColor: DesignSystemAsset.BlueGrayColor.gray500.color,
lineHeight: 22,
alignment: .left
)
self.cameraLabel.attributedText = cameraAttributedString

let cameraDescriptionAttributedString = NSMutableAttributedString(
string: "버그 제보 시 사진 촬영을 위해 사용",
attributes: [
.font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray500.color,
.kern: -0.5
]
notificationImageView.image = DesignSystemAsset.Permission.permissionNotification.image
setAttributedString(
with: notificationLabel,
text: "알림 (선택)",
font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
textColor: DesignSystemAsset.BlueGrayColor.gray900.color,
lineHeight: 24,
alignment: .left
)
self.cameraDescriptionLabel.attributedText = cameraDescriptionAttributedString
self.cameraDescriptionLabel.numberOfLines = 0

self.albumImageView.image = DesignSystemAsset.Permission.permissionAlbum.image
let albumAttributedString = NSMutableAttributedString(
string: "앨범",
attributes: [
.font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color,
.kern: -0.5
]
setSubAttributedString(with: notificationLabel, target: "(선택)")

notificationDescriptionLabel.numberOfLines = 0
setAttributedString(
with: notificationDescriptionLabel,
text: "알림 수신",
font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
textColor: DesignSystemAsset.BlueGrayColor.gray500.color,
lineHeight: 22,
alignment: .left
)
self.albumLabel.attributedText = albumAttributedString

let albumDescriptionAttributedString = NSMutableAttributedString(
string: "리스트 사진 변경, 가사 꾸미기, 버그 제보 시\n파일 첨부 또는 저장을 위해 사용",
attributes: [
.font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray500.color,
.kern: -0.5
]
cameraImageView.image = DesignSystemAsset.Permission.permissionCamera.image
setAttributedString(
with: cameraLabel,
text: "카메라 (선택)",
font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
textColor: DesignSystemAsset.BlueGrayColor.gray900.color,
lineHeight: 24,
alignment: .left
)
setSubAttributedString(with: cameraLabel, target: "(선택)")

cameraDescriptionLabel.numberOfLines = 0
setAttributedString(
with: cameraDescriptionLabel,
text: "버그 제보 시 사진 촬영",
font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
textColor: DesignSystemAsset.BlueGrayColor.gray500.color,
lineHeight: 22,
alignment: .left
)
self.albumDescriptionLabel.attributedText = albumDescriptionAttributedString
self.albumDescriptionLabel.numberOfLines = 0

self.firstDotLabel.layer.cornerRadius = 2
self.firstDotLabel.clipsToBounds = true

let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineHeightMultiple = 1.26

let firstDescriptionAttributedString = NSMutableAttributedString(
string: "선택적 접근 권한은 서비스 사용 중 필요한 시점에 동의를 받고 있습니다. 허용하지 않으셔도 서비스 이용이 가능합니다.",
attributes: [
.font: DesignSystemFontFamily.Pretendard.light.font(size: 12),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray500.color,
.paragraphStyle: paragraphStyle,
.kern: -0.5
]
albumImageView.image = DesignSystemAsset.Permission.permissionAlbum.image
setAttributedString(
with: albumLabel,
text: "앨범 (선택)",
font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
textColor: DesignSystemAsset.BlueGrayColor.gray900.color,
lineHeight: 24,
alignment: .left
)
setSubAttributedString(with: albumLabel, target: "(선택)")

albumDescriptionLabel.numberOfLines = 0
setAttributedString(
with: albumDescriptionLabel,
text: "리스트 사진 변경, 가사 꾸미기, 버그 제보 시\n파일 첨부 또는 저장",
font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
textColor: DesignSystemAsset.BlueGrayColor.gray500.color,
lineHeight: 22,
alignment: .left
)
self.firstDesciptionLabel.attributedText = firstDescriptionAttributedString

self.secondDotLabel.layer.cornerRadius = 2
self.secondDotLabel.clipsToBounds = true
[firstDotLabel, secondDotLabel].forEach {
$0.layer.cornerRadius = 2
$0.clipsToBounds = true
}

firstDesciptionLabel.numberOfLines = 0
setAttributedString(
with: firstDesciptionLabel,
text: "선택적 접근 권한은 서비스 사용 중 필요한 시점에 동의를 받고 있습니다. 허용하지 않으셔도 서비스 이용이 가능합니다.",
font: DesignSystemFontFamily.Pretendard.light.font(size: 12),
textColor: DesignSystemAsset.BlueGrayColor.gray500.color,
lineHeight: 18,
alignment: .left
)

let secondDescriptionAttributedString = NSMutableAttributedString(
string: "접근 권한 변경 방법 : 설정 > 왁타버스 뮤직",
attributes: [
.font: DesignSystemFontFamily.Pretendard.light.font(size: 12),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray500.color,
.kern: -0.5
]
secondDesciptionLabel.numberOfLines = 0
setAttributedString(
with: secondDesciptionLabel,
text: "접근 권한 변경 방법 : 설정 > 왁타버스 뮤직",
font: DesignSystemFontFamily.Pretendard.light.font(size: 12),
textColor: DesignSystemAsset.BlueGrayColor.gray500.color,
lineHeight: 18,
alignment: .left
)
self.secondDesciptionLabel.attributedText = secondDescriptionAttributedString

let confirmAttributedString = NSMutableAttributedString(
string: "확인",
Expand All @@ -154,10 +183,39 @@ extension PermissionViewController {
.kern: -0.5
]
)
self.confirmButton.setAttributedTitle(confirmAttributedString, for: .normal)
self.confirmButton.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
confirmButton.setAttributedTitle(confirmAttributedString, for: .normal)
confirmButton.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
borderViewWidthConstraint.constant = APP_WIDTH() < 375 ? (APP_WIDTH() - 40.0) : 335.0
}

func setAttributedString(
with label: UILabel,
text: String,
font: UIFont,
textColor: UIColor,
lineHeight: CGFloat,
alignment: NSTextAlignment = .left
) {
label.text = text
label.font = font
label.textColor = textColor
label.setTextWithAttributes(lineHeight: lineHeight, kernValue: -0.5, alignment: alignment)
}

self.borderViewWidthConstraint.constant = APP_WIDTH() < 375 ? (APP_WIDTH() - 40.0) : 335.0
self.view.layoutIfNeeded()
func setSubAttributedString(
with label: UILabel,
target text: String
) {
guard let attributedString = label.attributedText else { return }
let new = NSMutableAttributedString(attributedString: attributedString)
let range = (attributedString.string as NSString).range(of: text)
new.addAttributes(
[
.font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color
],
range: range
)
label.attributedText = new
}
}
22 changes: 22 additions & 0 deletions ...DesignSystem/Resources/Image/Permission.xcassets/permission_device.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...s/Image/Permission.xcassets/permission_device.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/Image/Permission.xcassets/permission_device.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions ...System/Resources/Image/Permission.xcassets/permission_notification.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...ission.xcassets/permission_notification.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ission.xcassets/permission_notification.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading