Skip to content

Commit

Permalink
Merge pull request #220 from teamterning/#219
Browse files Browse the repository at this point in the history
[Setting] #219 - v1.0.3 버전 배포 했습니다.
  • Loading branch information
thingineeer authored Oct 29, 2024
2 parents 37a9211 + d4ebaad commit 4d64830
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 38 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<p align="center"><img src="https://github.com/user-attachments/assets/984e7795-3746-4e7a-ad6c-cb1cb376c481"></p>

**내 계획에 딱 맞는 대학생 인턴의 시작, 터닝**
Expand Down
8 changes: 4 additions & 4 deletions Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1751,7 +1751,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
OTHER_LDFLAGS = (
"-Xlinker",
"-interposable",
Expand All @@ -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;
Expand All @@ -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 = "";
Expand Down
4 changes: 2 additions & 2 deletions Terning-iOS/Terning-iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<key>CFBundleDisplayName</key>
<string>terning</string>
<key>CFBundleShortVersionString</key>
<string>1.0.2</string>
<string>1.0.3</string>
<key>CFBundleVersion</key>
<string>2024.1021.2112</string>
<string>2024.1028.0142</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>CFBundleURLTypes</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "ios_ad_1.png",
"filename" : "ios_ad_2_month9.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "ios_ad_2_month9.png",
"filename" : "ios_ad_3.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down

0 comments on commit 4d64830

Please sign in to comment.