diff --git a/README.md b/README.md index 98e0db9e..361c3a29 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # 👔 terning 터닝 - 대학생 인턴, 공고 관리 캘린더 -## 앱스토어 링크 : [앱스토어](https://apps.apple.com/kr/app/terning-%ED%84%B0%EB%8B%9D-%EB%8C%80%ED%95%99%EC%83%9D-%EC%9D%B8%ED%84%B4-%EA%B3%B5%EA%B3%A0-%EA%B4%80%EB%A6%AC-%EC%BA%98%EB%A6%B0%EB%8D%94/id6547866420) v1.0.2 +## 앱스토어 링크 : [앱스토어](https://apps.apple.com/kr/app/terning-%ED%84%B0%EB%8B%9D-%EB%8C%80%ED%95%99%EC%83%9D-%EC%9D%B8%ED%84%B4-%EA%B3%B5%EA%B3%A0-%EA%B4%80%EB%A6%AC-%EC%BA%98%EB%A6%B0%EB%8D%94/id6547866420) v1.0.3

**내 계획에 딱 맞는 대학생 인턴의 시작, 터닝** diff --git a/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj b/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj index 9d7edf89..00b89923 100644 --- a/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj +++ b/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj @@ -1736,7 +1736,7 @@ CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2024.1021.2112; + CURRENT_PROJECT_VERSION = 2024.1028.0142; DEVELOPMENT_TEAM = 8Q4H7X3Q58; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1751,7 +1751,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.0.3; OTHER_LDFLAGS = ( "-Xlinker", "-interposable", @@ -1776,7 +1776,7 @@ CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2024.1021.2112; + CURRENT_PROJECT_VERSION = 2024.1028.0142; DEVELOPMENT_TEAM = 8Q4H7X3Q58; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1791,7 +1791,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.0.3; PRODUCT_BUNDLE_IDENTIFIER = "com.terning.Terning-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Terning-iOS/Terning-iOS/Info.plist b/Terning-iOS/Terning-iOS/Info.plist index 02a0a327..34a5e8e6 100644 --- a/Terning-iOS/Terning-iOS/Info.plist +++ b/Terning-iOS/Terning-iOS/Info.plist @@ -5,9 +5,9 @@ CFBundleDisplayName terning CFBundleShortVersionString - 1.0.2 + 1.0.3 CFBundleVersion - 2024.1021.2112 + 2024.1028.0142 ITSAppUsesNonExemptEncryption CFBundleURLTypes diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/Contents.json b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/Contents.json index 773aa282..3c6e8349 100644 --- a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/Contents.json +++ b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ios_ad_1.png", + "filename" : "ios_ad_2_month9.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/ios_ad_1.png b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/ios_ad_1.png deleted file mode 100644 index 22fd231a..00000000 Binary files a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/ios_ad_1.png and /dev/null differ diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/ios_ad_2_month9.png b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/ios_ad_2_month9.png similarity index 100% rename from Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/ios_ad_2_month9.png rename to Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_1.imageset/ios_ad_2_month9.png diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/Contents.json b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/Contents.json index 3c6e8349..d22274b9 100644 --- a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/Contents.json +++ b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ios_ad_2_month9.png", + "filename" : "ios_ad_3.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_3.imageset/ios_ad_3.png b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/ios_ad_3.png similarity index 100% rename from Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_3.imageset/ios_ad_3.png rename to Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_2.imageset/ios_ad_3.png diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_3.imageset/Contents.json b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_3.imageset/Contents.json deleted file mode 100644 index d22274b9..00000000 --- a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Images/img_ad_3.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "ios_ad_3.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewController/SearchViewController.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewController/SearchViewController.swift index 089b5258..4d1a843a 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewController/SearchViewController.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewController/SearchViewController.swift @@ -24,6 +24,7 @@ final class SearchViewController: UIViewController { private let disposeBag = DisposeBag() private let screenWidth = UIScreen.main.bounds.width + private lazy var initialBannerCount: CGFloat = CGFloat(viewModel.advertisements.count - 2) // MARK: - UI Components @@ -194,7 +195,7 @@ extension SearchViewController { collectionView.scrollToItem(at: IndexPath(item: nextItem, section: 0), at: .centeredHorizontally, animated: true) if visibleItem == initialAdCounts { - DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { + DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) { collectionView.scrollToItem(at: IndexPath(item: 1, section: 0), at: .centeredHorizontally, animated: false) } } @@ -303,12 +304,13 @@ extension SearchViewController: UICollectionViewDataSource { stopTimer() startTimer() - if scrollView.contentOffset.x == 0 { // 첫번째(3)가 보이면 3번째 index의 3으로 이동시키기 - scrollView.setContentOffset(.init(x: screenWidth * 3, y: scrollView.contentOffset.y), animated: false) - } else if scrollView.contentOffset.x == screenWidth * 4 { //마지막 1이 보이면 1번째 index의 1로 이동 + if scrollView.contentOffset.x == 0 { // 첫번째 배너 가 보이면 (배너 갯수) 번째 index의 배너갯수 으로 이동시키기 + scrollView.setContentOffset(.init(x: screenWidth * initialBannerCount, y: scrollView.contentOffset.y), animated: false) + } else if scrollView.contentOffset.x == screenWidth * (initialBannerCount + 1) { // 마지막 1이 보이면 1번째 index의 1로 이동 scrollView.setContentOffset(.init(x: screenWidth, y: scrollView.contentOffset.y), animated: false) } - rootView.pageControl.currentPage = Int(scrollView.contentOffset.x / scrollView.frame.maxX) - 1 + + rootView.pageControl.currentPage = Int(scrollView.contentOffset.x / scrollView.frame.maxX) - (Int(initialBannerCount) - 1) } } diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewModel/SearchViewModel.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewModel/SearchViewModel.swift index c07819ec..819e60d7 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewModel/SearchViewModel.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Search/ViewModel/SearchViewModel.swift @@ -40,9 +40,8 @@ final class SearchViewModel: ViewModelType { let announcements = input.viewDidLoad .do(onNext: { self.advertisements = [ - Advertisement(image: .imgAd1, url: "https://www.instagram.com/p/DBWCO97TRds/?igsh=bDhjMGxlMGliNDc2"), - Advertisement(image: .imgAd2, url: "https://www.instagram.com/terning_official/"), - Advertisement(image: .imgAd3, url: "https://forms.gle/4btEwEbUQ3JSjTKP7") + Advertisement(image: .imgAd1, url: "https://www.instagram.com/terning_official/"), + Advertisement(image: .imgAd2, url: "https://forms.gle/4btEwEbUQ3JSjTKP7") ] }) .map { self.advertisements }