Skip to content

Commit 84c5f59

Browse files
authored
Merge pull request #182 from thingineeer/Feat]-#178---CourseDetailVC-UI-수정
[Feat] #178 - 공유 기능 추가
2 parents 64c39b7 + aa188a0 commit 84c5f59

File tree

30 files changed

+346
-44
lines changed

30 files changed

+346
-44
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,7 @@ iOSInjectionProject/
111111
Config.swift
112112
Gemfile.lock
113113
report.xml
114-
Runnect-iOS/fastlane/.env.default
114+
Runnect-iOS/fastlane/.env.default
115+
116+
## dynamicLink
117+
Runnect-iOS/Runnect-iOS/GoogleService-Info.plist

Runnect-iOS/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ target 'Runnect-iOS' do
1313
pod 'KakaoSDKCommon'
1414
pod 'KakaoSDKAuth'
1515
pod 'KakaoSDKUser'
16+
pod 'KakaoSDKShare'
17+
pod 'KakaoSDKTemplate'
18+
pod 'FirebaseDynamicLinks'
1619

1720

1821
# Pods for Runnect-iOS

Runnect-iOS/Podfile.lock

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,52 @@
11
PODS:
2-
- Alamofire (5.6.4)
3-
- KakaoSDKAuth (2.14.0):
4-
- KakaoSDKCommon (= 2.14.0)
5-
- KakaoSDKCommon (2.14.0):
6-
- KakaoSDKCommon/Common (= 2.14.0)
7-
- KakaoSDKCommon/Network (= 2.14.0)
8-
- KakaoSDKCommon/Common (2.14.0)
9-
- KakaoSDKCommon/Network (2.14.0):
2+
- Alamofire (5.7.1)
3+
- FirebaseCore (10.14.0):
4+
- FirebaseCoreInternal (~> 10.0)
5+
- GoogleUtilities/Environment (~> 7.8)
6+
- GoogleUtilities/Logger (~> 7.8)
7+
- FirebaseCoreInternal (10.14.0):
8+
- "GoogleUtilities/NSData+zlib (~> 7.8)"
9+
- FirebaseDynamicLinks (10.14.0):
10+
- FirebaseCore (~> 10.0)
11+
- GoogleUtilities/Environment (7.11.5):
12+
- PromisesObjC (< 3.0, >= 1.2)
13+
- GoogleUtilities/Logger (7.11.5):
14+
- GoogleUtilities/Environment
15+
- "GoogleUtilities/NSData+zlib (7.11.5)"
16+
- KakaoSDKAuth (2.16.0):
17+
- KakaoSDKCommon (= 2.16.0)
18+
- KakaoSDKCommon (2.16.0):
19+
- KakaoSDKCommon/Common (= 2.16.0)
20+
- KakaoSDKCommon/Network (= 2.16.0)
21+
- KakaoSDKCommon/Common (2.16.0)
22+
- KakaoSDKCommon/Network (2.16.0):
1023
- Alamofire (~> 5.1)
11-
- KakaoSDKCommon/Common (= 2.14.0)
12-
- KakaoSDKUser (2.14.0):
13-
- KakaoSDKAuth (= 2.14.0)
14-
- Kingfisher (7.4.1)
24+
- KakaoSDKCommon/Common (= 2.16.0)
25+
- KakaoSDKShare (2.16.0):
26+
- KakaoSDKCommon (= 2.16.0)
27+
- KakaoSDKTemplate (= 2.16.0)
28+
- KakaoSDKTemplate (2.16.0):
29+
- KakaoSDKCommon/Common (= 2.16.0)
30+
- KakaoSDKUser (2.16.0):
31+
- KakaoSDKAuth (= 2.16.0)
32+
- Kingfisher (7.9.0)
1533
- Moya (15.0.0):
1634
- Moya/Core (= 15.0.0)
1735
- Moya/Core (15.0.0):
1836
- Alamofire (~> 5.0)
1937
- NMapsGeometry (1.0.1)
20-
- NMapsMap (3.16.1):
38+
- NMapsMap (3.17.0):
2139
- NMapsGeometry
40+
- PromisesObjC (2.3.1)
2241
- SnapKit (5.6.0)
2342
- Then (3.0.0)
2443

2544
DEPENDENCIES:
45+
- FirebaseDynamicLinks
2646
- KakaoSDKAuth
2747
- KakaoSDKCommon
48+
- KakaoSDKShare
49+
- KakaoSDKTemplate
2850
- KakaoSDKUser
2951
- Kingfisher (~> 7.0)
3052
- Moya (~> 15.0)
@@ -35,28 +57,42 @@ DEPENDENCIES:
3557
SPEC REPOS:
3658
trunk:
3759
- Alamofire
60+
- FirebaseCore
61+
- FirebaseCoreInternal
62+
- FirebaseDynamicLinks
63+
- GoogleUtilities
3864
- KakaoSDKAuth
3965
- KakaoSDKCommon
66+
- KakaoSDKShare
67+
- KakaoSDKTemplate
4068
- KakaoSDKUser
4169
- Kingfisher
4270
- Moya
4371
- NMapsGeometry
4472
- NMapsMap
73+
- PromisesObjC
4574
- SnapKit
4675
- Then
4776

4877
SPEC CHECKSUMS:
49-
Alamofire: 4e95d97098eacb88856099c4fc79b526a299e48c
50-
KakaoSDKAuth: 8fca87815de22062a23297983f327613b087b8bb
51-
KakaoSDKCommon: 0ce638f7a2e49704943c0b74a087a9f8067bba1c
52-
KakaoSDKUser: 2ca18314ce72e6690f76cb1f6f9fbc771d31a803
53-
Kingfisher: cd762a593a61b2fbecf7645c00f9a801a3ebfc9c
78+
Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
79+
FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02
80+
FirebaseCoreInternal: d558159ee6cc4b823c2296ecc193de9f6d9a5bb3
81+
FirebaseDynamicLinks: 0eaabff2d0e5d0e576c0227227b00771aa2f3aaf
82+
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
83+
KakaoSDKAuth: 1b85ed7c41b0517bfd1fc9dc46c292c75b8cb610
84+
KakaoSDKCommon: d6579aa2e9d963d74e13d741cbf1cce48b8b0c17
85+
KakaoSDKShare: efc0415c4f33274232604eeaf96fb03641facdca
86+
KakaoSDKTemplate: 7e478a3cda6f5879b475546bfcd667b464fbb6d0
87+
KakaoSDKUser: 427e5b3884abd19ee6d9a7bd6e3f3029eb2968b8
88+
Kingfisher: 59f908b6d2f403b0a3e539debb0eec05cb27002c
5489
Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee
5590
NMapsGeometry: 53c573ead66466681cf123f99f698dc8071a4b83
56-
NMapsMap: 926c3a303d381a24bec8da3cd6e198f50af93ae9
91+
NMapsMap: a5b909a31b6f3d27a670f6eb2ddc913c38975474
92+
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
5793
SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
5894
Then: 844265ae87834bbe1147d91d5d41a404da2ec27d
5995

60-
PODFILE CHECKSUM: fd71a741af1234cbd39c9117a0768b376c78640a
96+
PODFILE CHECKSUM: 43e89e9e217761b44c0c7e93fb4abfab29a82ece
6197

6298
COCOAPODS: 1.12.1

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
0AEBD608F3973389E8E1C6D6 /* Pods_Runnect_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 015778D02D5CDE0838284CD7 /* Pods_Runnect_iOS.framework */; };
1111
712F661D2A7B7BAB00D9539B /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 712F661C2A7B7BAB00D9539B /* Config.swift */; };
12+
71DBF23E2ABB255A0013415B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 71DBF23D2ABB255A0013415B /* GoogleService-Info.plist */; };
1213
A3305A97296EF58C000B1A10 /* GoalRewardInfoDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3305A96296EF58C000B1A10 /* GoalRewardInfoDto.swift */; };
1314
A3BC2F2B2962C3D500198261 /* GoalRewardInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */; };
1415
A3BC2F2D2962C3F200198261 /* ActivityRecordInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */; };
@@ -163,7 +164,9 @@
163164
/* Begin PBXFileReference section */
164165
015778D02D5CDE0838284CD7 /* Pods_Runnect_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runnect_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
165166
3C3033C911343B5C57EB68E7 /* Pods-Runnect-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runnect-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Runnect-iOS/Pods-Runnect-iOS.debug.xcconfig"; sourceTree = "<group>"; };
167+
7110A6032AA337DD009A7E99 /* Runnect-iOSDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Runnect-iOSDebug.entitlements"; sourceTree = "<group>"; };
166168
712F661C2A7B7BAB00D9539B /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
169+
71DBF23D2ABB255A0013415B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Runnect-iOS/Runnect-iOS/Runnect-iOS/GoogleService-Info.plist"; sourceTree = "<group>"; };
167170
A3305A96296EF58C000B1A10 /* GoalRewardInfoDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoDto.swift; sourceTree = "<group>"; };
168171
A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoVC.swift; sourceTree = "<group>"; };
169172
A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoVC.swift; sourceTree = "<group>"; };
@@ -792,11 +795,13 @@
792795
CE4545C7295D7AF4003201E1 /* Runnect-iOS */ = {
793796
isa = PBXGroup;
794797
children = (
798+
7110A6032AA337DD009A7E99 /* Runnect-iOSDebug.entitlements */,
795799
A3E55BA529C8AB0A0000D85D /* Runnect-iOS.entitlements */,
796800
CE6655AA295D7FAE00C64E12 /* Global */,
797801
CE6655A9295D7FAA00C64E12 /* Network */,
798802
CE6655A8295D7F7D00C64E12 /* Presentation */,
799803
CE4545D6295D7AF5003201E1 /* Info.plist */,
804+
71DBF23D2ABB255A0013415B /* GoogleService-Info.plist */,
800805
);
801806
path = "Runnect-iOS";
802807
sourceTree = "<group>";
@@ -941,8 +946,8 @@
941946
CE6655AF295D7FF600C64E12 /* Foundation */ = {
942947
isa = PBXGroup;
943948
children = (
944-
CE5875A1296015A2005D967E /* NetworkLoggerPlugin.swift */,
945949
CE40BB1D2968054F0030ABCA /* BaseResponse.swift */,
950+
CE5875A1296015A2005D967E /* NetworkLoggerPlugin.swift */,
946951
CE40BB1F296805F70030ABCA /* NetworkResult.swift */,
947952
CE40BB21296806140030ABCA /* NetworkHelper.swift */,
948953
712F661C2A7B7BAB00D9539B /* Config.swift */,
@@ -1043,8 +1048,8 @@
10431048
CE9291262965D0ED0010959C /* StatsInfoView.swift */,
10441049
CE6B63D729673450003F900F /* ListEmptyView.swift */,
10451050
CEB0BCBB29D123350048CCD5 /* GuideView.swift */,
1046-
A3C2CAD629E53B2900EC525B /* RNAlertVC.swift */,
10471051
CED791B22A2626AF001BFCFB /* ShadowView.swift */,
1052+
A3C2CAD629E53B2900EC525B /* RNAlertVC.swift */,
10481053
);
10491054
path = UIComponents;
10501055
sourceTree = "<group>";
@@ -1246,6 +1251,7 @@
12461251
files = (
12471252
CE665615295D989A00C64E12 /* .swiftlint.yml in Resources */,
12481253
CE17F0342961BEF800E1DED0 /* Pretendard-Bold.otf in Resources */,
1254+
71DBF23E2ABB255A0013415B /* GoogleService-Info.plist in Resources */,
12491255
CE17F0352961BEF800E1DED0 /* Pretendard-SemiBold.otf in Resources */,
12501256
CE17F0332961BEF800E1DED0 /* Pretendard-Medium.otf in Resources */,
12511257
CE6655BF295D82E200C64E12 /* .gitkeep in Resources */,
@@ -1601,7 +1607,7 @@
16011607
buildSettings = {
16021608
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
16031609
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1604-
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements";
1610+
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOSDebug.entitlements";
16051611
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16061612
CODE_SIGN_STYLE = Manual;
16071613
DEVELOPMENT_TEAM = "";
@@ -1617,6 +1623,7 @@
16171623
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
16181624
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
16191625
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
1626+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
16201627
LD_RUNPATH_SEARCH_PATHS = (
16211628
"$(inherited)",
16221629
"@executable_path/Frameworks",
@@ -1643,7 +1650,7 @@
16431650
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
16441651
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
16451652
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements";
1646-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
1653+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16471654
CODE_SIGN_STYLE = Manual;
16481655
DEVELOPMENT_TEAM = "";
16491656
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9K86FQHDLU;
@@ -1658,6 +1665,7 @@
16581665
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
16591666
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
16601667
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
1668+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
16611669
LD_RUNPATH_SEARCH_PATHS = (
16621670
"$(inherited)",
16631671
"@executable_path/Frameworks",
@@ -1666,7 +1674,7 @@
16661674
PRODUCT_BUNDLE_IDENTIFIER = "com.runnect.Runnect-iOS";
16671675
PRODUCT_NAME = "$(TARGET_NAME)";
16681676
PROVISIONING_PROFILE_SPECIFIER = "";
1669-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.runnect.Runnect-iOS";
1677+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.runnect.Runnect-iOS";
16701678
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
16711679
SUPPORTS_MACCATALYST = NO;
16721680
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ enum ImageLiterals {
4646
static var icPlus: UIImage { .load(named: "ic_plus") }
4747
static var icCheck: UIImage { .load(named: "ic_check") }
4848
static var icCheckFill: UIImage { .load(named: "ic_check_fill") }
49+
static var icFollowButton: UIImage {.load(named: "ic_follow_button")}
50+
static var icFollowedButton: UIImage {.load(named: "ic_followed_button")}
51+
static var icShareButton: UIImage {.load(named: "ic_share")}
4952

5053
// img
5154
static var imgBackground: UIImage { .load(named: "img_background") }
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Property 1=follow 2.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "Property 1=follow [email protected]",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "Property 1=follow [email protected]",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
1.2 KB
Loading
2.11 KB
Loading
2.86 KB
Loading

Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json renamed to Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_followed_button.imageset/Contents.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
22
"images" : [
33
{
4-
"filename" : "ios 3.png",
4+
"filename" : "follow 1.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9+
"filename" : "follow [email protected]",
910
"idiom" : "universal",
1011
"scale" : "2x"
1112
},
1213
{
14+
"filename" : "follow [email protected]",
1315
"idiom" : "universal",
1416
"scale" : "3x"
1517
}

0 commit comments

Comments
 (0)