-
Notifications
You must be signed in to change notification settings - Fork 24
박스오피스 앱 [STEP 3] Jin #61
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.
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
Open
wlsdud-dev
wants to merge
22
commits into
tasty-code:d_Sam
Choose a base branch
from
ParkChanH:step3
base: d_Sam
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
6dd7f22
feat: collection view 화면 배치
wlsdud-dev fe7cdf2
feat: collection view cell 화면 레이아웃 구현
wlsdud-dev 67147c9
refactor: 박스오피스 개체 수정
wlsdud-dev 6e8d689
refactor: 네트워크 수정
wlsdud-dev 19f2139
feat: collection view 데이터 연결
wlsdud-dev 9cda8d9
feat: 네비게이션바 타이틀 날짜 연결
wlsdud-dev 26a0a51
feat: uilabel extension 텍스트 색상 변경 기능 구현
wlsdud-dev a622e0e
feat: string 익스텐션 숫자 세자리 , 추가 기능 구현
wlsdud-dev 15e82f1
영화 랭크 변경 라벨 기능 추가
wlsdud-dev 5709ee7
feat: 로딩 뷰 구현
wlsdud-dev ec8f920
feat: 로딩 뷰 구현
wlsdud-dev 8429e7d
feat: 박스오피스컨트롤러 시작 로딩뷰 적용
wlsdud-dev d405c19
refactor: 코드 컨벤션 수정
wlsdud-dev 37db680
refactor: 숫자 변환 string 익스텐션 수정
wlsdud-dev 9d3620f
refacotor: UIlabel 익스텐션 주석 제거
wlsdud-dev 827fe1a
refactor: 상속이 불필요한 클래스 final 키워드 추가
wlsdud-dev 9d9af8a
refactor: BoxOfficeListCell 수정
wlsdud-dev be26a51
refactor: BoxOfficeListCell formatMovieLabel 메서드 수정
wlsdud-dev 6b4e3bc
불필요한 주석 제거
wlsdud-dev 0c52589
refactor: BoxOfficeController 로딩뷰 호출 방식 수정
wlsdud-dev c57f80e
refactor: 로딩뷰 수정
wlsdud-dev d9e129d
refactor: BoxiofficeViewController 데이터 요청 메서드 수정
wlsdud-dev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,52 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r"> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="g4C-0s-Sww"> | ||
| <device id="retina6_12" orientation="portrait" appearance="light"/> | ||
| <dependencies> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/> | ||
| <capability name="Safe area layout guides" minToolsVersion="9.0"/> | ||
| <capability name="System colors in document resources" minToolsVersion="11.0"/> | ||
| <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| </dependencies> | ||
| <scenes> | ||
| <!--View Controller--> | ||
| <!--Box Office View Controller--> | ||
| <scene sceneID="tne-QT-ifu"> | ||
| <objects> | ||
| <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController"> | ||
| <viewController id="BYZ-38-t0r" customClass="BoxOfficeViewController" customModule="BoxOffice" customModuleProvider="target" sceneMemberID="viewController"> | ||
| <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC"> | ||
| <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | ||
| <rect key="frame" x="0.0" y="0.0" width="393" height="852"/> | ||
| <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
| <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> | ||
| <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/> | ||
| <color key="backgroundColor" systemColor="systemBackgroundColor"/> | ||
| </view> | ||
| <navigationItem key="navigationItem" id="hpq-z3-vqG"/> | ||
| </viewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="942.74809160305335" y="-34.507042253521128"/> | ||
| </scene> | ||
| <!--Navigation Controller--> | ||
| <scene sceneID="SIH-9C-ylN"> | ||
| <objects> | ||
| <navigationController automaticallyAdjustsScrollViewInsets="NO" id="g4C-0s-Sww" sceneMemberID="viewController"> | ||
| <toolbarItems/> | ||
| <navigationBar key="navigationBar" contentMode="scaleToFill" id="4ZQ-WP-c2h"> | ||
| <rect key="frame" x="0.0" y="59" width="393" height="44"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| </navigationBar> | ||
| <nil name="viewControllers"/> | ||
| <connections> | ||
| <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="Qgx-b8-odc"/> | ||
| </connections> | ||
| </navigationController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="zEL-Of-r7N" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="16.030534351145036" y="-34.507042253521128"/> | ||
| </scene> | ||
| </scenes> | ||
| <resources> | ||
| <systemColor name="systemBackgroundColor"> | ||
| <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| </systemColor> | ||
| </resources> | ||
| </document> |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // | ||
| // String+.swift | ||
| // BoxOffice | ||
| // | ||
| // Created by Jin-Mac on 3/20/24. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| extension String { | ||
|
|
||
| func formatDecimalNumberString() -> String { | ||
| let formatter = NumberFormatter() | ||
| formatter.numberStyle = .decimal | ||
| formatter.locale = Locale.current | ||
| guard let number = Double(self), | ||
| let changedString = formatter.string(from: NSNumber(value: number)) else { | ||
| return self | ||
| } | ||
| return changedString | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // UILabel+.swift | ||
| // BoxOffice | ||
| // | ||
| // Created by Jin-Mac on 3/20/24. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| extension UILabel { | ||
|
|
||
| func setTextColor(_ color: UIColor, range: NSRange) { | ||
| guard let attributedString = self.mutableAttributedString() else { return } | ||
|
|
||
| attributedString.addAttribute(NSAttributedString.Key.foregroundColor, value: color, range: range) | ||
| self.attributedText = attributedString | ||
| } | ||
|
|
||
| private func mutableAttributedString() -> NSMutableAttributedString? { | ||
| guard let labelText = self.text, let labelFont = self.font else { return nil } | ||
|
|
||
| var attributedString: NSMutableAttributedString? | ||
| if let attributedText = self.attributedText { | ||
| attributedString = attributedText.mutableCopy() as? NSMutableAttributedString | ||
| } else { | ||
| attributedString = NSMutableAttributedString(string: labelText, | ||
| attributes: [NSAttributedString.Key.font :labelFont]) | ||
| } | ||
|
|
||
| return attributedString | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // | ||
| // UIViewController+.swift | ||
| // BoxOffice | ||
| // | ||
| // Created by Jin-Mac on 3/20/24. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| extension UIViewController { | ||
|
|
||
| func presentAlert(title: String, | ||
| message: String? = nil, | ||
| confirmTitle: String = "확인", | ||
| confirmAction: ((UIAlertAction) -> Void)? = nil, | ||
| completion: (() -> Void)? = nil) { | ||
| let alertViewController = UIAlertController(title: title, message: message, preferredStyle: .alert) | ||
|
|
||
| let confirmAction = UIAlertAction(title: confirmTitle, style: .default) | ||
| alertViewController.addAction(confirmAction) | ||
|
|
||
| self.present(alertViewController, animated: true, completion: completion) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.