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

[Fix] #240 - 일부 UI의 오토레이아웃 수정 하였습니다. #241

Merged
merged 5 commits into from
Jan 6, 2024
Merged

[Fix] #240 - 일부 UI의 오토레이아웃 수정 하였습니다. #241

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
1cffe8d
[Add] #240 - 새 배너 추가
thingineeer Jan 5, 2024
49824e0
[Fix] #240 - 스크랩 수 오토 레이아웃 수정
thingineeer Jan 5, 2024
8b41e28
[Fix] #240 - 코스 발견 정렬 버튼 오토 레이아웃 수정
thingineeer Jan 5, 2024
eed0914
[Fix] #240 - 코스 발견 업로드 버튼 오토 레이아웃 수정
thingineeer Jan 5, 2024
bdcca09
[Add] #240 - 작은 업로드 버튼 asset 추가
thingineeer Jan 5, 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
1 change: 0 additions & 1 deletion Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ enum ImageLiterals {
static var imgBanner1: UIImage { .load(named: "img_banner1") }
static var imgBanner2: UIImage { .load(named: "img_banner2") }
static var imgBanner3: UIImage { .load(named: "img_banner3") }
static var imgBanner4: UIImage { .load(named: "img_banner4") }
static var imgAppleLogin: UIImage { .load(named: "img_apple_login")}
static var imgKakaoLogin: UIImage { .load(named: "img_kakao_login")}
}
Expand Down
Binary file modified ...t-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125.png
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 modified ...OS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@2x.png
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 modified ...OS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@3x.png
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.
21 changes: 21 additions & 0 deletions Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "ios 앱 배너.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...S/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/ios 앱 배너.png
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.
2 changes: 1 addition & 1 deletion Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ extension CourseDetailVC {

scrapCountLabel.snp.makeConstraints {
$0.top.equalTo(likeButton.snp.bottom).offset(2)
$0.leading.equalToSuperview().offset(26)
$0.leading.equalToSuperview().offset(28)
$0.width.equalTo(20)
$0.height.equalTo(13)
}
Expand Down
2 changes: 1 addition & 1 deletion Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class AdImageCollectionViewCell: UICollectionViewCell, UIScrollViewDelegat
final let collectionViewInset = UIEdgeInsets(top: 28, left: 16, bottom: 28, right: 16)

// MARK: - UI Components
var imgBanners: [UIImage] = [ImageLiterals.imgBanner1, ImageLiterals.imgBanner2]
var imgBanners: [UIImage] = [ImageLiterals.imgBanner3, ImageLiterals.imgBanner1, ImageLiterals.imgBanner2]
var currentPage: Int = 0
private var timer: Timer?

Expand Down
4 changes: 2 additions & 2 deletions Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/TitleCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ extension TitleCollectionViewCell {

dateSortButton.snp.makeConstraints {
$0.top.equalTo(divideView.snp.bottom).offset(54)
$0.leading.equalTo(titleStackView.snp.trailing).offset(57)
$0.trailing.equalTo(scrapSortButton.snp.leading).offset(-16)
}

scrapSortButton.snp.makeConstraints {
$0.top.equalTo(divideView.snp.bottom).offset(54)
$0.leading.equalTo(dateSortButton.snp.trailing).offset(8)
$0.trailing.equalToSuperview().offset(-16)
}
}
}
4 changes: 2 additions & 2 deletions Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ extension CourseDiscoveryVC {
}

uploadButton.snp.makeConstraints { make in
make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(16)
make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22)
make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20)
make.height.equalTo(40)
make.width.equalTo(92)
}

miniUploadButton.snp.makeConstraints { make in
make.leading.equalTo(self.view.safeAreaLayoutGuide).inset(276)
make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22)
make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20)
make.width.height.equalTo(41)
}
Expand Down