Skip to content

[Design] duration 디자인 통일, 플레이어 버튼 이미지 및 배치 수정 #104

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

Merged
jihyeonjjang merged 2 commits into from
Jun 17, 2025
Merged

[Design] duration 디자인 통일, 플레이어 버튼 이미지 및 배치 수정 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0218b83
design: duration 디자인 통일
jihyeonjjang Jun 17, 2025
55bb80f
design: 플레이어 dismiss 버튼 이미지 및 배치 수정
jihyeonjjang Jun 17, 2025
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
39 changes: 24 additions & 15 deletions PickaView/Views/Player/Player.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,6 @@
<constraint firstAttribute="width" secondItem="bLj-qx-k1w" secondAttribute="height" multiplier="16:9" id="m4i-RB-yPq"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="영상시간" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5E6-Ol-dXG">
<rect key="frame" x="326" y="192.66666666666666" width="59" height="20.333333333333343"/>
<color key="backgroundColor" systemColor="quaternaryLabelColor"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="HOi-rZ-Nph">
<rect key="frame" x="8" y="229" width="377" height="74"/>
<subviews>
Expand All @@ -181,13 +174,13 @@
<stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" axis="vertical" distribution="equalSpacing" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="1w0-Em-S0C">
<rect key="frame" x="85.666666666666657" y="17" width="291.33333333333337" height="40"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Tw-i7-PoV">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Tw-i7-PoV">
<rect key="frame" x="0.0" y="0.0" width="291.33333333333331" height="19.333333333333332"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wo4-l1-mnc">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wo4-l1-mnc">
<rect key="frame" x="0.0" y="24.333333333333318" width="291.33333333333331" height="15.666666666666668"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand All @@ -200,15 +193,33 @@
<constraint firstItem="1w0-Em-S0C" firstAttribute="leading" secondItem="701-0t-ylk" secondAttribute="trailing" constant="20" id="qHc-8A-fD1"/>
</constraints>
</stackView>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iuT-PI-qce">
<rect key="frame" x="333.66666666666669" y="188.66666666666666" width="51.333333333333314" height="24.333333333333343"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qid-vg-iT5">
<rect key="frame" x="5" y="2" width="41.333333333333336" height="20.333333333333332"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.40000000000000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="Qid-vg-iT5" secondAttribute="bottom" constant="2" id="ZEr-XN-v5Q"/>
<constraint firstItem="Qid-vg-iT5" firstAttribute="leading" secondItem="iuT-PI-qce" secondAttribute="leading" constant="5" id="leB-gt-Iya"/>
<constraint firstItem="Qid-vg-iT5" firstAttribute="top" secondItem="iuT-PI-qce" secondAttribute="top" constant="2" id="sQ0-ew-9P7"/>
<constraint firstAttribute="trailing" secondItem="Qid-vg-iT5" secondAttribute="trailing" constant="5" id="uy0-Ax-WiC"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="HOi-rZ-Nph" secondAttribute="trailing" constant="8" id="3my-cS-eIM"/>
<constraint firstItem="bLj-qx-k1w" firstAttribute="trailing" secondItem="5E6-Ol-dXG" secondAttribute="trailing" constant="8" id="5Nb-kD-RtF"/>
<constraint firstItem="HOi-rZ-Nph" firstAttribute="leading" secondItem="XIJ-Sh-3CW" secondAttribute="leading" constant="8" id="GBr-ha-gu7"/>
<constraint firstItem="bLj-qx-k1w" firstAttribute="bottom" secondItem="5E6-Ol-dXG" secondAttribute="bottom" constant="8" id="O9K-vE-9za"/>
<constraint firstItem="iuT-PI-qce" firstAttribute="bottom" secondItem="bLj-qx-k1w" secondAttribute="bottom" constant="-8" id="ONm-of-our"/>
<constraint firstItem="bLj-qx-k1w" firstAttribute="top" secondItem="XIJ-Sh-3CW" secondAttribute="top" id="Oij-nO-M55"/>
<constraint firstItem="bLj-qx-k1w" firstAttribute="leading" secondItem="XIJ-Sh-3CW" secondAttribute="leading" id="P0n-eG-1rm"/>
<constraint firstItem="iuT-PI-qce" firstAttribute="trailing" secondItem="bLj-qx-k1w" secondAttribute="trailing" constant="-8" id="XT7-Tf-hmT"/>
<constraint firstAttribute="trailing" secondItem="bLj-qx-k1w" secondAttribute="trailing" id="aeq-7n-WqZ"/>
<constraint firstItem="HOi-rZ-Nph" firstAttribute="top" secondItem="bLj-qx-k1w" secondAttribute="bottom" constant="8" id="clp-27-kRK"/>
<constraint firstItem="701-0t-ylk" firstAttribute="height" secondItem="bLj-qx-k1w" secondAttribute="width" multiplier="1:6" id="hQx-SP-41d"/>
Expand All @@ -225,8 +236,9 @@
</collectionViewCellContentView>
<size key="customSize" width="393" height="303"/>
<connections>
<outlet property="durationLabel" destination="Qid-vg-iT5" id="DDX-kO-OX7"/>
<outlet property="durationView" destination="iuT-PI-qce" id="qLo-Ft-v72"/>
<outlet property="thumbnailImageView" destination="bLj-qx-k1w" id="dYk-u2-LYL"/>
<outlet property="totalTimeLabel" destination="5E6-Ol-dXG" id="QKb-om-eIf"/>
<outlet property="userImageView" destination="701-0t-ylk" id="zsS-jM-BxY"/>
<outlet property="usernameLabel" destination="2Tw-i7-PoV" id="4Xm-Ap-wmD"/>
<outlet property="viewsLabel" destination="Wo4-l1-mnc" id="Twa-QG-FXA"/>
Expand Down Expand Up @@ -336,9 +348,6 @@
<namedColor name="MainColor">
<color red="0.5490196078431373" green="0.0" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="quaternaryLabelColor">
<color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.1764705882" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
Expand Down
10 changes: 6 additions & 4 deletions PickaView/Views/Player/PlayerViewCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ import UIKit
/// 썸네일, 영상 길이, 업로더 정보(이미지, 이름), 조회수를 표시
class PlayerViewCollectionViewCell: UICollectionViewCell {
@IBOutlet weak var thumbnailImageView: UIImageView!
@IBOutlet weak var totalTimeLabel: UILabel!
@IBOutlet weak var userImageView: UIImageView!
@IBOutlet weak var usernameLabel: UILabel!
@IBOutlet weak var viewsLabel: UILabel!
@IBOutlet weak var durationView: UIView!
@IBOutlet weak var durationLabel: UILabel!

override func layoutSubviews() {
super.layoutSubviews()

// 프로필 이미지를 원형으로 설정
durationView.layer.cornerRadius = 4

userImageView.layer.cornerRadius = userImageView.frame.width / 2
userImageView.clipsToBounds = true
}
Expand All @@ -32,9 +34,9 @@ class PlayerViewCollectionViewCell: UICollectionViewCell {

// 총 재생 시간을 포맷팅하여 표시
if let durationSeconds = video.timeStamp?.totalTime {
totalTimeLabel.text = Int(durationSeconds).toDurationString()
durationLabel.text = Int(durationSeconds).toDurationString()
} else {
totalTimeLabel.text = "Duration: N/A"
durationLabel.text = "Duration: N/A"
}

// 사용자 이미지 설정, 없으면 기본 이미지 사용
Expand Down
7 changes: 6 additions & 1 deletion PickaView/Views/Player/PlayerViewController+UI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ extension PlayerViewController {
controlsOverlayView.addSubview(seekerStack)
controlsOverlayView.addSubview(fullscreenButton)
controlsOverlayView.addSubview(dismissButton)

videoContainerView.addSubview(rateTwoView)
videoContainerView.insertSubview(rateTwoView, belowSubview: controlsOverlayView)

rateTwoView.layer.cornerRadius = 8

// 세로/가로 레이아웃 제약 정의
portraitConstraints = [
Expand Down Expand Up @@ -67,7 +72,7 @@ extension PlayerViewController {
fullscreenButton.trailingAnchor.constraint(equalTo: controlsOverlayView.trailingAnchor, constant: -16),

dismissButton.topAnchor.constraint(equalTo: controlsOverlayView.topAnchor, constant: 16),
dismissButton.leadingAnchor.constraint(equalTo: controlsOverlayView.leadingAnchor, constant: 16)
dismissButton.trailingAnchor.constraint(equalTo: controlsOverlayView.trailingAnchor, constant: -16)
])

// 버튼 고정 크기 설정
Expand Down
9 changes: 1 addition & 8 deletions PickaView/Views/Player/PlayerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class PlayerViewController: UIViewController, PlayerViewControllerDelegate {

/// 닫기 버튼
lazy var dismissButton: UIButton = {
let button = createButton(systemName: "chevron.down", useSmallConfig: true)
let button = createButton(systemName: "xmark", useSmallConfig: true)
button.addTarget(self, action: #selector(handleDismissButtonTapped(_:)), for: .touchUpInside)
return button
}()
Expand Down Expand Up @@ -179,13 +179,6 @@ class PlayerViewController: UIViewController, PlayerViewControllerDelegate {
setupGestures()
addPlayerObservers()

// rateTwoView를 playerLayer 위, controlsOverlayView 아래에 위치
videoContainerView.addSubview(rateTwoView)
videoContainerView.insertSubview(rateTwoView, belowSubview: controlsOverlayView)

// Apply rounded corners to rateTwoLabel
rateTwoView.layer.cornerRadius = 8

// 기기 방향 변화 알림 등록
NotificationCenter.default.addObserver(
self,
Expand Down