Skip to content

Commit 1e99f23

Browse files
thingineeerthingineeer
authored
Merge pull request #273 from thingineeer/#272
[Fix] #272 - 공유기능개선 및 2.2.0 앱스토어 배포
2 parents 49097f6 + f8ef7ff commit 1e99f23

File tree

9 files changed

+44
-21
lines changed

9 files changed

+44
-21
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# 한줄 소개
44
러닝과 일상을 Connect하다! 데일리 러닝앱 서비스 Runnect 🏃
55

6-
### 앱스토어 링크: [Appstore](https://apps.apple.com/kr/app/runnect-%EC%BD%94%EC%8A%A4%EB%A5%BC-%EA%B7%B8%EB%A6%AC%EA%B3%A0-%EA%B3%B5%EC%9C%A0%ED%95%98%EB%8A%94-%EB%8D%B0%EC%9D%BC%EB%A6%AC-%EB%9F%AC%EB%8B%9D%EC%95%B1/id1663884202) v2.1.0
6+
### 앱스토어 링크: [Appstore](https://apps.apple.com/kr/app/runnect-%EC%BD%94%EC%8A%A4%EB%A5%BC-%EA%B7%B8%EB%A6%AC%EA%B3%A0-%EA%B3%B5%EC%9C%A0%ED%95%98%EB%8A%94-%EB%8D%B0%EC%9D%BC%EB%A6%AC-%EB%9F%AC%EB%8B%9D%EC%95%B1/id1663884202) v2.2.0
77

88
![1](https://github.com/thingineeer/Runnect-iOS/assets/88179341/937f9e65-61e5-4298-b703-bc2cf5022bf6)
99
![2](https://github.com/thingineeer/Runnect-iOS/assets/88179341/ad913367-65f2-4839-9658-e538bccf2d6c)
1010

1111
<br>
1212

13-
### iOS Developers <~ing>
13+
## iOS Developers <~ing>
1414
<img src = "https://github.com/Runnect/Runnect-iOS/assets/88179341/a3633fff-f50b-4afa-a54f-8bd0b3d8668c" width = "40%" height = "40%"> | <img src = "https://github.com/Runnect/Runnect-iOS/assets/88179341/f8884b2b-4cd6-4077-9d9f-683e62f8137f" width = "40%" height = "40%"> |
1515
:---------:|:----------:
1616
[이명진](https://github.com/thingineeer) | [이소진](https://github.com/513sojin) |

‎Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,10 +1387,14 @@
13871387
inputFileListPaths = (
13881388
"${PODS_ROOT}/Target Support Files/Pods-Runnect-iOS/Pods-Runnect-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
13891389
);
1390+
inputPaths = (
1391+
);
13901392
name = "[CP] Embed Pods Frameworks";
13911393
outputFileListPaths = (
13921394
"${PODS_ROOT}/Target Support Files/Pods-Runnect-iOS/Pods-Runnect-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
13931395
);
1396+
outputPaths = (
1397+
);
13941398
runOnlyForDeploymentPostprocessing = 0;
13951399
shellPath = /bin/sh;
13961400
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runnect-iOS/Pods-Runnect-iOS-frameworks.sh\"\n";
@@ -1700,7 +1704,7 @@
17001704
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOSDebug.entitlements";
17011705
CODE_SIGN_IDENTITY = "Apple Development";
17021706
CODE_SIGN_STYLE = Automatic;
1703-
CURRENT_PROJECT_VERSION = 2024.1128.0304;
1707+
CURRENT_PROJECT_VERSION = 2025.0513.2138;
17041708
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
17051709
GENERATE_INFOPLIST_FILE = NO;
17061710
INFOPLIST_FILE = "Runnect-iOS/Info.plist";
@@ -1718,7 +1722,7 @@
17181722
"$(inherited)",
17191723
"@executable_path/Frameworks",
17201724
);
1721-
MARKETING_VERSION = 2.1.0;
1725+
MARKETING_VERSION = 2.2.0;
17221726
PRODUCT_BUNDLE_IDENTIFIER = "com.runnect.Runnect-iOS";
17231727
PRODUCT_NAME = "$(TARGET_NAME)";
17241728
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1741,7 +1745,7 @@
17411745
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements";
17421746
CODE_SIGN_IDENTITY = "Apple Development";
17431747
CODE_SIGN_STYLE = Automatic;
1744-
CURRENT_PROJECT_VERSION = 2024.1128.0304;
1748+
CURRENT_PROJECT_VERSION = 2025.0513.2138;
17451749
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
17461750
GENERATE_INFOPLIST_FILE = NO;
17471751
INFOPLIST_FILE = "Runnect-iOS/Info.plist";
@@ -1759,7 +1763,7 @@
17591763
"$(inherited)",
17601764
"@executable_path/Frameworks",
17611765
);
1762-
MARKETING_VERSION = 2.1.0;
1766+
MARKETING_VERSION = 2.2.0;
17631767
PRODUCT_BUNDLE_IDENTIFIER = "com.runnect.Runnect-iOS";
17641768
PRODUCT_NAME = "$(TARGET_NAME)";
17651769
PROVISIONING_PROFILE_SPECIFIER = "";

‎Runnect-iOS/Runnect-iOS/Global/Extension/UIKit+/UIButton+.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ extension UIButton {
5656

5757
func press(vibrate: Bool = false,
5858
animated: Bool = true,
59-
for controlEvents: UIControl.Event = .touchUpInside, _ closure: @escaping() -> Void) {
59+
for controlEvents: UIControl.Event = .touchUpInside, _ closure: @escaping () -> Void) {
6060
if #available(iOS 14.0, *) {
6161
self.addAction(UIAction { _ in closure()
6262
if animated { self.clickedAnimation(vibrate: vibrate) }
6363
}, for: controlEvents)
6464
} else {
6565
@objc class ClosureSleeve: NSObject {
6666
let closure: () -> Void
67-
init(_ closure: @escaping() -> Void) { self.closure = closure }
67+
init(_ closure: @escaping () -> Void) { self.closure = closure }
6868
@objc func invoke() { closure() }
6969
}
7070
let sleeve = ClosureSleeve(closure)

‎Runnect-iOS/Runnect-iOS/Global/Supports/SceneDelegate.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
5151
let window = UIWindow(windowScene: windowScene)
5252
let navigationController = UINavigationController()
5353

54+
if UserManager.shared.userType != .registered { UserManager.shared.userType = .visitor }
55+
5456
switch courseType {
5557
case .publicCourse:
5658
let courseDetailVC = CourseDetailVC()

‎Runnect-iOS/Runnect-iOS/Global/Utils/RNUtils/UserManager.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class UserManager {
2828
@UserDefaultWrapper<String>(key: "refreshToken") public var refreshToken
2929
@UserDefaultWrapper<Bool>(key: "isKakao") public var isKakao
3030
var hasAccessToken: Bool { return self.accessToken != nil }
31-
var userType: UserType = .registered
31+
var userType: UserType = .visitor
3232

3333
private init() {}
3434

@@ -38,7 +38,7 @@ final class UserManager {
3838
self.isKakao = isKakao
3939
}
4040

41-
func signIn(token: String, provider: String, completion: @escaping(Result<String, RNError>) -> Void) {
41+
func signIn(token: String, provider: String, completion: @escaping (Result<String, RNError>) -> Void) {
4242
authProvider.request(.signIn(token: token, provider: provider)) { [weak self] response in
4343
guard let self = self else { return }
4444
switch response {
@@ -79,7 +79,7 @@ final class UserManager {
7979
}
8080
}
8181

82-
func getNewToken(completion: @escaping(Result<Bool, RNError>) -> Void) {
82+
func getNewToken(completion: @escaping (Result<Bool, RNError>) -> Void) {
8383
authProvider.request(.getNewToken) { [weak self] response in
8484
guard let self = self else { return }
8585
switch response {

‎Runnect-iOS/Runnect-iOS/Info.plist‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>ITSAppUsesNonExemptEncryption</key>
6-
<false/>
7-
<key>CFBundleIconName</key>
8-
<string>AppIcon</string>
95
<key>CFBundleDevelopmentRegion</key>
106
<string>$(DEVELOPMENT_LANGUAGE)</string>
117
<key>CFBundleDisplayName</key>
128
<string>Runnect</string>
139
<key>CFBundleExecutable</key>
1410
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIconName</key>
12+
<string>AppIcon</string>
1513
<key>CFBundleIdentifier</key>
1614
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1715
<key>CFBundleInfoDictionaryVersion</key>
@@ -21,7 +19,7 @@
2119
<key>CFBundlePackageType</key>
2220
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
2321
<key>CFBundleShortVersionString</key>
24-
<string>2.1.0</string>
22+
<string>2.2.0</string>
2523
<key>CFBundleURLTypes</key>
2624
<array>
2725
<dict>
@@ -46,7 +44,9 @@
4644
</dict>
4745
</array>
4846
<key>CFBundleVersion</key>
49-
<string>2024.1128.0304</string>
47+
<string>2025.0513.2138</string>
48+
<key>ITSAppUsesNonExemptEncryption</key>
49+
<false/>
5050
<key>LSApplicationQueriesSchemes</key>
5151
<array>
5252
<string>kakaokompassauth</string>

‎Runnect-iOS/Runnect-iOS/Network/Service/NetworkProvider.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Moya
99

1010
class NetworkProvider<Provider: TargetType>: MoyaProvider<Provider> {
11-
func request<Model: Codable>(target: Provider, instance: Model.Type, vc: UIViewController, completion: @escaping(Model) -> Void) {
11+
func request<Model: Codable>(target: Provider, instance: Model.Type, vc: UIViewController, completion: @escaping (Model) -> Void) {
1212
self.request(target) { result in
1313
switch result {
1414
/// 서버 통신 성공

‎Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ extension CourseDetailVC {
259259
func setData(model: UploadedCourseDetailResponseDto) {
260260
self.uploadedCourseDetailModel = model
261261
self.userId = model.user.id
262+
self.publicCourseId = model.publicCourse.id
263+
self.courseId = model.publicCourse.courseId
262264
self.mapImageView.setImage(with: model.publicCourse.image)
263265
self.profileImageView.image = GoalRewardInfoModel.stampNameImageDictionary[model.user.image]
264266
// 탈퇴 유저 처리
@@ -358,10 +360,18 @@ extension CourseDetailVC {
358360
$0.centerY.equalTo(navibar)
359361
}
360362

361-
shareButton.snp.makeConstraints {
362-
$0.trailing.trailing.equalTo(moreButton).offset(-50)
363-
$0.centerY.equalTo(navibar)
363+
if UserManager.shared.userType == .visitor {
364+
shareButton.snp.makeConstraints {
365+
$0.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(10)
366+
$0.centerY.equalTo(navibar)
367+
}
368+
} else {
369+
shareButton.snp.makeConstraints {
370+
$0.trailing.equalTo(moreButton).offset(-50)
371+
$0.centerY.equalTo(navibar)
372+
}
364373
}
374+
365375
}
366376

367377
private func setUI() {
@@ -372,6 +382,12 @@ extension CourseDetailVC {
372382
firstHorizontalDivideLine.backgroundColor = .g3
373383
secondHorizontalDivideLine.backgroundColor = .g5
374384
thirdHorizontalDivideLine.backgroundColor = .g3
385+
386+
guard UserManager.shared.userType != .visitor else {
387+
// 방문자일 경우 더보기 버튼 제거
388+
moreButton.isHidden = true
389+
return
390+
}
375391
}
376392

377393
private func setLayout() {

‎Runnect-iOS/Runnect-iOS/Presentation/SignIn/VC/NickNameSetUpVC.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ extension NickNameSetUpVC {
160160
do {
161161
let responseDto = try result.map(BaseResponse<BlankData>.self)
162162
if responseDto.status == 200 {
163+
UserManager.shared.userType = .registered
163164
self.pushToTabBarController()
164165
} else {
165166
self.showToast(message: responseDto.message)

0 commit comments

Comments
 (0)