Skip to content

Commit

Permalink
Merge branch 'release/2.2.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
KangTaeHoon committed Dec 2, 2023
2 parents 4ff9779 + b8d7a7b commit 10ca6b3
Show file tree
Hide file tree
Showing 114 changed files with 582 additions and 313 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ Derived/
### Tuist managed dependencies ###
Tuist/Dependencies

### Tuist Signing ###
Tuist/Signing
### Tuist Master.key ###
Tuist/master.key

### Secrets
Secrets.xcconfig
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "AppIcon_1024x1024.png",
"filename" : "AppIcon.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,21 +181,21 @@ extension ArtistDetailHeaderViewController {

artistGroupLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
artistGroupLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
artistGroupLabel.setLineSpacing(kernValue: -0.5)
artistGroupLabel.setTextWithAttributes(kernValue: -0.5)

artistIntroLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
artistIntroLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
artistIntroLabel.textAlignment = .left

introTitleLabel.font = DesignSystemFontFamily.Pretendard.bold.font(size: 14)
introTitleLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
introTitleLabel.setLineSpacing(kernValue: -0.5)
introTitleLabel.setTextWithAttributes(kernValue: -0.5)

introDescriptionLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12)
introDescriptionLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
introDescriptionLabel.textAlignment = .left
introDescriptionLabel.lineBreakMode = .byWordWrapping
introDescriptionLabel.setLineSpacing(kernValue: -0.5)
introDescriptionLabel.setTextWithAttributes(kernValue: -0.5)

scrollView.scrollIndicatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: -3)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// AES256.swift
// Utility
// BaseFeature
//
// Created by KTH on 2023/02/18.
// Created by KTH on 2023/11/26.
// Copyright © 2023 yongbeomkwak. All rights reserved.
//

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EditSheetView" customModule="CommonFeature">
<connections>
<outlet property="contentView" destination="M9Z-HL-r4z" id="iZP-tt-QDa"/>
<outlet property="editButton" destination="Dsf-9d-UBD" id="WK6-vh-b7V"/>
<outlet property="nicknameButton" destination="aDx-pj-LIu" id="Z5y-gc-B0h"/>
<outlet property="profileButton" destination="w8w-82-gfR" id="UoJ-Oy-Tmg"/>
Expand All @@ -23,7 +24,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M9Z-HL-r4z">
<rect key="frame" x="40" y="0.0" width="313" height="56"/>
<rect key="frame" x="40" y="-34" width="313" height="56"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="BYt-Uz-3A6">
<rect key="frame" x="0.0" y="0.0" width="313" height="56"/>
Expand Down Expand Up @@ -94,7 +95,7 @@
</objects>
<resources>
<namedColor name="POINT">
<color red="0.030999999493360519" green="0.87099999189376831" blue="0.96899998188018799" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.035999998450279236" green="0.7850000262260437" blue="0.94999998807907104" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="gray25">
<color red="0.99199998378753662" green="0.99199998378753662" blue="0.99199998378753662" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand All @@ -24,6 +24,7 @@
<outlet property="selectCountView" destination="hyL-bt-hk1" id="ZWH-Ag-UzJ"/>
<outlet property="selectCountViewLeadingConstraint" destination="mx6-sm-wqY" id="jaf-16-4KU"/>
<outlet property="songAddButton" destination="6p4-Ao-cyX" id="Mn0-2O-iRI"/>
<outlet property="stackContentView" destination="Yth-61-Aze" id="2H3-q8-aL1"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
Expand Down Expand Up @@ -178,7 +179,7 @@
</objects>
<resources>
<namedColor name="POINT">
<color red="0.030999999493360519" green="0.87099999189376831" blue="0.96899998188018799" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.035999998450279236" green="0.7850000262260437" blue="0.94999998807907104" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="gray25">
<color red="0.99199998378753662" green="0.99199998378753662" blue="0.99199998378753662" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,17 @@ extension ContainSongsViewController {
titleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
titleLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleLabel.text = "리스트에 담기"
titleLabel.setLineSpacing(kernValue: -0.5)
titleLabel.setTextWithAttributes(kernValue: -0.5)

songCountLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
songCountLabel.textColor = DesignSystemAsset.PrimaryColor.point.color
songCountLabel.text = "\(viewModel.songs.count)"
songCountLabel.setLineSpacing(kernValue: -0.5)
songCountLabel.setTextWithAttributes(kernValue: -0.5)

subTitleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
subTitleLabel.textColor = DesignSystemAsset.PrimaryColor.sub3.color
subTitleLabel.text = "곡 선택"
subTitleLabel.setLineSpacing(kernValue: -0.5)
subTitleLabel.setTextWithAttributes(kernValue: -0.5)

indicator.type = .circleStrokeSpin
indicator.color = DesignSystemAsset.PrimaryColor.point.color
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ extension ContractViewController{
titleLabel.text = type.title
titleLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
titleLabel.setLineSpacing(kernValue: -0.5)
titleLabel.setTextWithAttributes(kernValue: -0.5)

DispatchQueue.global(qos: .default).async {
if let url = URL(string: self.type.url), let document = PDFDocument(url: url) {
DispatchQueue.main.async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ extension NewSongsViewController {
self.navigationTitleLabel.text = "최신 음악"
self.navigationTitleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
self.navigationTitleLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
self.navigationTitleLabel.setLineSpacing(kernValue: -0.5)
self.navigationTitleLabel.setTextWithAttributes(kernValue: -0.5)
}

private func configurePage() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ extension OpenSourceLicenseViewController {
titleStringLabel.text = "오픈소스 라이선스"
titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleStringLabel.setLineSpacing(kernValue: -0.5)
titleStringLabel.setTextWithAttributes(kernValue: -0.5)
tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 56))
tableView.scrollIndicatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 56, right: 0)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,15 @@ extension PlayListDetailViewController{

self.editStateLabel.text = "편집"
self.editStateLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
self.editStateLabel.setLineSpacing(kernValue: -0.5)
self.editStateLabel.setTextWithAttributes(kernValue: -0.5)

self.playListCountLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 14)
self.playListCountLabel.textColor = DesignSystemAsset.GrayColor.gray900.color.withAlphaComponent(0.6) // opacity 60%
self.playListCountLabel.setLineSpacing(kernValue: -0.5)
self.playListCountLabel.setTextWithAttributes(kernValue: -0.5)

self.playListNameLabel.font = DesignSystemFontFamily.Pretendard.bold.font(size: 20)
self.playListNameLabel.setLineSpacing(kernValue: -0.5)
self.playListNameLabel.setTextWithAttributes(kernValue: -0.5)

playListInfoView.layer.borderWidth = 1
playListInfoView.layer.borderColor = colorFromRGB(0xFCFCFD).cgColor
playListInfoView.layer.cornerRadius = 8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final class ProfilePopViewController: UIViewController, ViewControllerFro
extension ProfilePopViewController{

private func configureUI(){

saveButton.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
saveButton.layer.cornerRadius = 12
saveButton.clipsToBounds = true
saveButton.setAttributedTitle(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ extension ServiceInfoViewController {
titleStringLabel.text = "서비스 정보"
titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleStringLabel.setLineSpacing(kernValue: -0.5)
titleStringLabel.setTextWithAttributes(kernValue: -0.5)
tableView.tableHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 20))
tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 56))
tableView.scrollIndicatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 56, right: 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ extension TextPopupViewController {
)
cancelButton.setAttributedTitle(cancelAttributedString, for: .normal)

confirmButton.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
confirmButton.layer.cornerRadius = cancelButton.layer.cornerRadius
confirmButton.clipsToBounds = true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class CurrentPlayListTableViewCell: UITableViewCell {
self.playListImageView.layer.cornerRadius = 4
self.playListNameLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
self.playListNameLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
self.playListNameLabel.setLineSpacing(kernValue: -0.5)
self.playListNameLabel.setTextWithAttributes(kernValue: -0.5)
self.playListCountLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12)
self.playListCountLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
self.playListCountLabel.setLineSpacing(kernValue: -0.5)
self.playListCountLabel.setTextWithAttributes(kernValue: -0.5)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public enum EditSheetSelectType {
}

public class EditSheetView: UIView {

@IBOutlet weak var contentView: UIView!
@IBOutlet weak var editButton: UIButton!
@IBOutlet weak var shareButton: UIButton!
@IBOutlet weak var profileButton: UIButton!
Expand Down Expand Up @@ -99,7 +99,7 @@ public extension EditSheetView {
}

private func configureUI() {

contentView.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
let titles: [String] = ["편집", "공유하기", "프로필 변경", "닉네임 수정"]

let images: [UIImage] = [DesignSystemAsset.PlayListEdit.playlistEdit.image,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ extension NewSongsCell {
titleStringLabel.text = model.title
titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
titleStringLabel.setLineSpacing(kernValue: -0.5)
titleStringLabel.setTextWithAttributes(kernValue: -0.5)

artistLabel.text = model.artist
artistLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
artistLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12)
artistLabel.setLineSpacing(kernValue: -0.5)
artistLabel.setTextWithAttributes(kernValue: -0.5)

viewsLabel.text = model.views.addCommaToNumber() + ""
viewsLabel.font = DesignSystemFontFamily.SCoreDream._3Light.font(size: 12)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public class OpenSourceLibraryCell: UITableViewCell {
self.contentView.backgroundColor = .clear
titleStringLabel.font = DesignSystemFontFamily.Pretendard.bold.font(size: 15)
titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleStringLabel.setLineSpacing(kernValue: -0.5)
titleStringLabel.setTextWithAttributes(kernValue: -0.5)
titleStringLabel.numberOfLines = 0
descriptionLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 13)
descriptionLabel.textColor = DesignSystemAsset.GrayColor.gray500.color
descriptionLabel.setLineSpacing(kernValue: -0.5)
descriptionLabel.setTextWithAttributes(kernValue: -0.5)
descriptionLabel.lineBreakMode = .byWordWrapping
descriptionLabel.numberOfLines = 0
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class OpenSourceLicenseCell: UITableViewCell {
self.contentView.backgroundColor = .clear
titleStringLabel.font = DesignSystemFontFamily.Pretendard.bold.font(size: 18)
titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleStringLabel.setLineSpacing(kernValue: -0.5)
titleStringLabel.setTextWithAttributes(kernValue: -0.5)
titleStringLabel.numberOfLines = 0
descriptionLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 13)
descriptionLabel.textColor = DesignSystemAsset.GrayColor.gray500.color
descriptionLabel.setLineSpacing(kernValue: -0.5)
descriptionLabel.setTextWithAttributes(kernValue: -0.5)
descriptionLabel.lineBreakMode = .byWordWrapping
descriptionLabel.numberOfLines = 0
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ class ServiceInfoCell: UITableViewCell {
self.contentView.backgroundColor = .clear
titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
titleStringLabel.setLineSpacing(kernValue: -0.5)
titleStringLabel.setTextWithAttributes(kernValue: -0.5)
subTitleStringLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12)
subTitleStringLabel.textColor = DesignSystemAsset.GrayColor.gray500.color
subTitleStringLabel.setLineSpacing(kernValue: -0.5)
subTitleStringLabel.setTextWithAttributes(kernValue: -0.5)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class SongCartView: UIView {
@IBOutlet weak var selectCountView: UIView!
@IBOutlet weak var selectCountViewLeadingConstraint: NSLayoutConstraint!
@IBOutlet weak var selectCountLabel: UILabel!
@IBOutlet weak var stackContentView: UIView!
@IBOutlet weak var bottomSpaceView: UIView!
@IBOutlet weak var bottomSpaceViewHeight: NSLayoutConstraint!

Expand Down Expand Up @@ -199,6 +200,7 @@ public extension SongCartView {
}
}

stackContentView.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
bottomSpaceView.backgroundColor = DesignSystemAsset.PrimaryColor.point.color
bottomSpaceViewHeight.constant = SAFEAREA_BOTTOM_HEIGHT()
layoutIfNeeded()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extension WarningView {
private func configureUI() {
warningImageView.image = DesignSystemAsset.Search.warning.image
warningLabelView.textColor = DesignSystemAsset.GrayColor.gray900.color
warningLabelView.setLineSpacing(kernValue: -0.5)
warningLabelView.setTextWithAttributes(kernValue: -0.5)
warningLabelView.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ extension HomeViewController {
latestSongEmptyLabel.text = "현재 집계된 음악이 없습니다."
latestSongEmptyLabel.textColor = DesignSystemAsset.GrayColor.gray900.color
latestSongEmptyLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
latestSongEmptyLabel.setLineSpacing(kernValue: -0.5)
latestSongEmptyLabel.setTextWithAttributes(kernValue: -0.5)
latestSongEmptyLabel.textAlignment = .center
scrollView.refreshControl = refreshControl
scrollView.delegate = self
Expand Down
Loading

0 comments on commit 10ca6b3

Please sign in to comment.