Skip to content

[Setting] #242 - 1.0.8 버전 수정 및 배너 수정 #243

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
merged 6 commits into from
Jan 11, 2024
Merged

[Setting] #242 - 1.0.8 버전 수정 및 배너 수정 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b16253
[Feat] #242 - 새 배너 추가
thingineeer Jan 6, 2024
652649c
[Setting] 1.0.8 Build
thingineeer Jan 6, 2024
59cd145
[Fix] #242 - 코스 검색 안되는 이슈 해결
thingineeer Jan 6, 2024
a0eba49
[Fix] #242 - 미니 업로드 버튼 레이아웃 수정
thingineeer Jan 10, 2024
39eaac2
[Chore] #242 - CourseListCVC 테두리 1px 요구사항 추가
thingineeer Jan 10, 2024
0ea1f47
[Chore] #242 - scrapCount Dto 추가
thingineeer Jan 10, 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
4 changes: 2 additions & 2 deletions Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,7 @@
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOSDebug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.0.7;
CURRENT_PROJECT_VERSION = 1.0.8;
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = "Runnect-iOS/Info.plist";
Expand Down Expand Up @@ -1751,7 +1751,7 @@
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.0.7;
CURRENT_PROJECT_VERSION = 1.0.8;
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = "Runnect-iOS/Info.plist";
Expand Down
4 changes: 3 additions & 1 deletion Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"images" : [
{
"filename" : "ios 1.png",
"filename" : "ios 앱 배너-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ios 앱 배너@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ios 앱 배너@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Binary file added ...Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios 앱 배너-1.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.
0 ...cassets/img_banner3.imageset/ios 앱 배너.png → ...sets/img_banner1.imageset/ios 앱 배너@2x.png
View file
Open in desktop
File renamed without changes
Binary file added ...unnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios 앱 배너@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.
2 changes: 1 addition & 1 deletion Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "ios 2.png",
"filename" : "ios 1.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
0 ...s.xcassets/img_banner1.imageset/ios 1.png → ...s.xcassets/img_banner2.imageset/ios 1.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion 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
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "ios 앱 배너.png",
"filename" : "ios 2.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
0 ...s.xcassets/img_banner2.imageset/ios 2.png → ...s.xcassets/img_banner3.imageset/ios 2.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion Runnect-iOS/Runnect-iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0.7</string>
<string>1.0.8</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand Down
6 changes: 6 additions & 0 deletions ...t-iOS/Runnect-iOS/Network/Dto/CourseDetailDto/ResponseDto/CourseDetailScrapCountDto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@ import Foundation

struct CourseDetailScrapCountDto: Codable {
let scrapCount: Int

let publicCourse: Int?
let scarpTF: Bool?
Comment on lines +14 to +15
Copy link
Collaborator

@513sojin 513sojin Jan 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

옵셔널 값 줘서 dto 또 안만든 명진 칭찬해 ..

/*
코스 아이디와, 스크랩 TF는 사용 안함, 필요시 사용
*/
}
4 changes: 2 additions & 2 deletions ...iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/PickedMapListResponseDto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Foundation
// MARK: - PickedMapListResponseDto

struct PickedMapListResponseDto: Codable {
let totalPageSize: Int
let isEnd: Bool
let totalPageSize: Int?
let isEnd: Bool?
let publicCourses: [PublicCourse]
}

Expand Down
23 changes: 12 additions & 11 deletions 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.imgBanner3, ImageLiterals.imgBanner1, ImageLiterals.imgBanner2]
var imgBanners: [UIImage] = [ImageLiterals.imgBanner1, ImageLiterals.imgBanner2, ImageLiterals.imgBanner3]
var currentPage: Int = 0
private var timer: Timer?

Expand Down Expand Up @@ -128,19 +128,20 @@ extension AdImageCollectionViewCell: UICollectionViewDelegate, UICollectionViewD
imageView.isUserInteractionEnabled = true
cell.contentView.addSubviews(imageView)

if indexPath.item == 0 {
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(firstCellTapped(_:)))
imageView.addGestureRecognizer(tapGesture)
}
// 터치 이벤트 임시 제거
// if indexPath.item == 0 {
// let tapGesture = UITapGestureRecognizer(target: self, action: #selector(firstCellTapped(_:)))
// imageView.addGestureRecognizer(tapGesture)
// }
return cell
}
// 첫 번째 셀 클릭 이벤트 핸들러
@objc func firstCellTapped(_ gesture: UITapGestureRecognizer) {
// Safari 링크로 연결
if let url = URL(string: "https://docs.google.com/forms/d/1cpgZHNNi1kIvi2ZCwCIcMJcI1PkHBz9a5vWJb7FfIbg/edit") {
UIApplication.shared.open(url)
}
}
// @objc func firstCellTapped(_ gesture: UITapGestureRecognizer) {
// // Safari 링크로 연결
// if let url = URL(string: "https://docs.google.com/forms/d/1cpgZHNNi1kIvi2ZCwCIcMJcI1PkHBz9a5vWJb7FfIbg/edit") {
// UIApplication.shared.open(url)
// }
// }
Comment on lines +131 to +144
Copy link
Collaborator

@513sojin 513sojin Jan 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

배너 터치 이벤트 뺀거 확인했습니다 ~

Copy link
Collaborator Author

@thingineeer thingineeer Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

확인 감사합니다 ~


}

Expand Down
10 changes: 6 additions & 4 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,7 +207,7 @@ extension CourseDiscoveryVC {
}

uploadButton.snp.makeConstraints { make in
make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22)
make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(21)
make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20)
make.height.equalTo(40)
make.width.equalTo(92)
Expand All @@ -216,7 +216,6 @@ extension CourseDiscoveryVC {
miniUploadButton.snp.makeConstraints { make in
make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22)
make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20)
make.width.height.equalTo(41)
}

emptyView.snp.makeConstraints { make in
Expand Down Expand Up @@ -490,8 +489,11 @@ extension CourseDiscoveryVC {
do {
let responseDto = try result.map(BaseResponse<PickedMapListResponseDto>.self)
guard let data = responseDto.data else { return }
self.totalPageNum = data.totalPageSize
self.isEnd = data.isEnd

guard let totalPageNum = data.totalPageSize, let isEnd = data.isEnd else { return }
self.totalPageNum = totalPageNum
self.isEnd = isEnd

self.courseList.append(contentsOf: data.publicCourses)
self.mapCollectionView.reloadData()
print("pageNo= \(pageNo), isEnd= \(self.isEnd), totalPageNum= \(self.totalPageNum)")
Expand Down
2 changes: 2 additions & 0 deletions Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ extension CourseListCVC {
extension CourseListCVC {
private func setUI() {
self.contentView.backgroundColor = .w1
self.courseImageView.layer.borderColor = UIColor(hex: "EAEAEA").cgColor /// 모든 코스 테두리 1px 요구사항
self.courseImageView.layer.borderWidth = 1.0
}

private func setLayout() {
Expand Down