Skip to content

Commit

Permalink
Merge pull request #203 from dnd-side-project/196-feature/push-notifi…
Browse files Browse the repository at this point in the history
…cation

[#196] 설정화면 토글 - 외부 설정 앱과 값 바인딩
  • Loading branch information
Parkjju authored Apr 26, 2024
2 parents 84305e3 + 230a52a commit c3b07e0
Show file tree
Hide file tree
Showing 17 changed files with 350 additions and 191 deletions.
24 changes: 12 additions & 12 deletions Milestone/Milestone.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
88216FC02A85328900FE3A77 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88216FBF2A85328900FE3A77 /* LoginViewController.swift */; };
A2216C8D2AEE450F00A368EC /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = A2216C8C2AEE450F00A368EC /* Config.xcconfig */; };
A2248E832A8818AD00EB995A /* LowerGoalTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2248E822A8818AD00EB995A /* LowerGoalTableViewCell.swift */; };
A2248E842A8818AD00EB995A /* LowerGoalTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2248E822A8818AD00EB995A /* LowerGoalTableViewCell.swift */; };
A2248E852A8818AD00EB995A /* LowerGoalTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2248E822A8818AD00EB995A /* LowerGoalTableViewCell.swift */; };
Expand Down Expand Up @@ -101,6 +100,7 @@
A28EDA192A879565001A021A /* DetailUpperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A28EDA182A879565001A021A /* DetailUpperViewController.swift */; };
A28EDA1A2A879565001A021A /* DetailUpperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A28EDA182A879565001A021A /* DetailUpperViewController.swift */; };
A28EDA1B2A879565001A021A /* DetailUpperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A28EDA182A879565001A021A /* DetailUpperViewController.swift */; };
A293D3152BDB6931007CA9DC /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = A293D3142BDB6931007CA9DC /* Config.xcconfig */; };
A298E9592A9968B000EC0067 /* JewelPopUpImageStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A298E9582A9968B000EC0067 /* JewelPopUpImageStyle.swift */; };
A2A303192AC3B090006823F3 /* NetworkFailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2A303182AC3B090006823F3 /* NetworkFailView.swift */; };
A2A3031A2AC3B090006823F3 /* NetworkFailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2A303182AC3B090006823F3 /* NetworkFailView.swift */; };
Expand Down Expand Up @@ -262,9 +262,9 @@
C91007032AB335E8000A9C16 /* RxKakaoSDKAuth in Frameworks */ = {isa = PBXBuildFile; productRef = C91007022AB335E8000A9C16 /* RxKakaoSDKAuth */; };
C91007052AB335E8000A9C16 /* RxKakaoSDKCommon in Frameworks */ = {isa = PBXBuildFile; productRef = C91007042AB335E8000A9C16 /* RxKakaoSDKCommon */; };
C91007072AB335E8000A9C16 /* RxKakaoSDKShare in Frameworks */ = {isa = PBXBuildFile; productRef = C91007062AB335E8000A9C16 /* RxKakaoSDKShare */; };
C91007092AB335E8000A9C16 /* RxKakaoSDKStory in Frameworks */ = {isa = PBXBuildFile; productRef = C91007082AB335E8000A9C16 /* RxKakaoSDKStory */; };
C910070B2AB335E8000A9C16 /* RxKakaoSDKTalk in Frameworks */ = {isa = PBXBuildFile; productRef = C910070A2AB335E8000A9C16 /* RxKakaoSDKTalk */; };
C910070D2AB335E8000A9C16 /* RxKakaoSDKUser in Frameworks */ = {isa = PBXBuildFile; productRef = C910070C2AB335E8000A9C16 /* RxKakaoSDKUser */; };
C91A6C372BDB7E4000C0BAE7 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C91A6C362BDB7E4000C0BAE7 /* SceneDelegate.swift */; };
C947D9112AC28BE100015407 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C947D9102AC28BE100015407 /* OnboardingViewController.swift */; };
C947D9132AC28D5300015407 /* OnboardingViewControllerFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = C947D9122AC28D5300015407 /* OnboardingViewControllerFirst.swift */; };
C947D9152AC28D5E00015407 /* OnboardingViewControllerSecond.swift in Sources */ = {isa = PBXBuildFile; fileRef = C947D9142AC28D5E00015407 /* OnboardingViewControllerSecond.swift */; };
Expand Down Expand Up @@ -344,7 +344,6 @@

/* Begin PBXFileReference section */
88216FBF2A85328900FE3A77 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
A2216C8C2AEE450F00A368EC /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = ../Config.xcconfig; sourceTree = "<group>"; };
A2248E822A8818AD00EB995A /* LowerGoalTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LowerGoalTableViewCell.swift; sourceTree = "<group>"; };
A2248E862A8A076D00EB995A /* MoreViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreViewController.swift; sourceTree = "<group>"; };
A2248E8A2A8A0C5400EB995A /* MoreOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreOptionView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -388,6 +387,7 @@
A28EDA102A87808A001A021A /* UIViewController+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+.swift"; sourceTree = "<group>"; };
A28EDA142A8791F7001A021A /* LowerGoalCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LowerGoalCollectionViewCell.swift; sourceTree = "<group>"; };
A28EDA182A879565001A021A /* DetailUpperViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailUpperViewController.swift; sourceTree = "<group>"; };
A293D3142BDB6931007CA9DC /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = ../Config.xcconfig; sourceTree = "<group>"; };
A298E9582A9968B000EC0067 /* JewelPopUpImageStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JewelPopUpImageStyle.swift; sourceTree = "<group>"; };
A2A303182AC3B090006823F3 /* NetworkFailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkFailView.swift; sourceTree = "<group>"; };
A2B20D582A7E4E5C001ED73C /* UIFont+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -454,6 +454,7 @@
C91006F82AA0534D000A9C16 /* LoginType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginType.swift; sourceTree = "<group>"; };
C91006FA2AA7085C000A9C16 /* ModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
C91006FD2AA70C22000A9C16 /* SettingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingViewModel.swift; sourceTree = "<group>"; };
C91A6C362BDB7E4000C0BAE7 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
C947D9102AC28BE100015407 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
C947D9122AC28D5300015407 /* OnboardingViewControllerFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewControllerFirst.swift; sourceTree = "<group>"; };
C947D9142AC28D5E00015407 /* OnboardingViewControllerSecond.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewControllerSecond.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -519,7 +520,6 @@
C91007072AB335E8000A9C16 /* RxKakaoSDKShare in Frameworks */,
C9040FD52A93C87900270E94 /* FirebaseMessaging in Frameworks */,
A2B20D502A7E3EE1001ED73C /* RxSwift in Frameworks */,
C91007092AB335E8000A9C16 /* RxKakaoSDKStory in Frameworks */,
A2B20D562A7E3F05001ED73C /* Alamofire in Frameworks */,
A2B20D4E2A7E3EE1001ED73C /* RxRelay in Frameworks */,
C910070D2AB335E8000A9C16 /* RxKakaoSDKUser in Frameworks */,
Expand Down Expand Up @@ -610,6 +610,7 @@
isa = PBXGroup;
children = (
A22736682A7CE53700D7B3B2 /* AppDelegate.swift */,
C91A6C362BDB7E4000C0BAE7 /* SceneDelegate.swift */,
C90DC9752A876F5D00241B7C /* AppCoordinator.swift */,
C90DC9792A88814700241B7C /* Coordinator.swift */,
A22736762A7CE53800D7B3B2 /* Info.plist */,
Expand All @@ -621,7 +622,7 @@
A22736992A7CE73600D7B3B2 /* Screens */ = {
isa = PBXGroup;
children = (
A2216C8C2AEE450F00A368EC /* Config.xcconfig */,
A293D3142BDB6931007CA9DC /* Config.xcconfig */,
A2FA59342A7FD718006ACA2E /* Onboarding */,
A2B9697F2A8574EA00C4903F /* Main */,
A2D304C42A856AE900A5BA92 /* StorageBox */,
Expand Down Expand Up @@ -1167,7 +1168,6 @@
C91007022AB335E8000A9C16 /* RxKakaoSDKAuth */,
C91007042AB335E8000A9C16 /* RxKakaoSDKCommon */,
C91007062AB335E8000A9C16 /* RxKakaoSDKShare */,
C91007082AB335E8000A9C16 /* RxKakaoSDKStory */,
C910070A2AB335E8000A9C16 /* RxKakaoSDKTalk */,
C910070C2AB335E8000A9C16 /* RxKakaoSDKUser */,
C947D91B2AC30D4200015407 /* Lottie */,
Expand Down Expand Up @@ -1271,7 +1271,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A2216C8D2AEE450F00A368EC /* Config.xcconfig in Resources */,
A293D3152BDB6931007CA9DC /* Config.xcconfig in Resources */,
C9040FD22A93C80300270E94 /* GoogleService-Info.plist in Resources */,
C90DC9272A81FF2000241B7C /* .swiftlint.yml in Resources */,
A2B20D7E2A7E50D8001ED73C /* Pretendard-Medium.otf in Resources */,
Expand Down Expand Up @@ -1468,6 +1468,7 @@
A2B9698B2A859EAB00C4903F /* UIButton+.swift in Sources */,
C9B2CE202A8F62B2006289A8 /* Service.swift in Sources */,
C9B2CE4B2A92F95E006289A8 /* LowerGoal.swift in Sources */,
C91A6C372BDB7E4000C0BAE7 /* SceneDelegate.swift in Sources */,
C9B2CE1D2A8F5783006289A8 /* APISession.swift in Sources */,
A2FA59252A7FD3B1006ACA2E /* UICollectionView+.swift in Sources */,
A2D304C12A854EDE00A5BA92 /* MainSegmentedControl.swift in Sources */,
Expand Down Expand Up @@ -1657,6 +1658,7 @@
/* Begin XCBuildConfiguration section */
A227368D2A7CE53800D7B3B2 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A293D3142BDB6931007CA9DC /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -1718,6 +1720,7 @@
};
A227368E2A7CE53800D7B3B2 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A293D3142BDB6931007CA9DC /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -1773,6 +1776,7 @@
};
A22736902A7CE53800D7B3B2 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A293D3142BDB6931007CA9DC /* Config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -1808,6 +1812,7 @@
};
A22736912A7CE53800D7B3B2 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A293D3142BDB6931007CA9DC /* Config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -2099,11 +2104,6 @@
package = C91006FF2AB335E8000A9C16 /* XCRemoteSwiftPackageReference "kakao-ios-sdk-rx" */;
productName = RxKakaoSDKShare;
};
C91007082AB335E8000A9C16 /* RxKakaoSDKStory */ = {
isa = XCSwiftPackageProductDependency;
package = C91006FF2AB335E8000A9C16 /* XCRemoteSwiftPackageReference "kakao-ios-sdk-rx" */;
productName = RxKakaoSDKStory;
};
C910070A2AB335E8000A9C16 /* RxKakaoSDKTalk */ = {
isa = XCSwiftPackageProductDependency;
package = C91006FF2AB335E8000A9C16 /* XCRemoteSwiftPackageReference "kakao-ios-sdk-rx" */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"originHash" : "bee0b67ee8d34c2a0a40ec6ed96284f8b8bfe36a47b4f85ea6b06a942aae46f1",
"pins" : [
{
"identity" : "abseil-cpp-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
"version" : "1.2022062300.0"
"revision" : "748c7837511d0e6a507737353af268484e1745e2",
"version" : "1.2024011601.1"
}
},
{
Expand All @@ -16,97 +15,115 @@
"location" : "https://github.com/Alamofire/Alamofire",
"state" : {
"branch" : "master",
"revision" : "4abb04eb7aa7c73ea22ca8d02567fb652a7ad629"
"revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "7d2688de038d5484866d835acb47b379722d610e",
"version" : "10.19.0"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "df2171b0c6afb9e9d4f7e07669d558c510b9f6be",
"version" : "10.13.0"
"revision" : "42eae77a0af79e9c3f41df04a23c76f05cfdda77",
"version" : "10.24.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "03b9beee1a61f62d32c521e172e192a1663a5e8b",
"version" : "10.13.0"
"revision" : "51ba746a9d51a4bd0774b68499b0c73ef6e8570d",
"version" : "10.24.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "aae45a320fd0d11811820335b1eabc8753902a40",
"version" : "9.2.5"
"revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
"version" : "9.4.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "c38ce365d77b04a9a300c31061c5227589e5597b",
"version" : "7.11.5"
"revision" : "26c898aed8bed13b8a63057ee26500abbbcb8d55",
"version" : "7.13.1"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "f1b366129d1125be7db83247e003fc333104b569",
"version" : "1.50.2"
"revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359",
"version" : "1.62.2"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
"version" : "3.1.1"
"revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
"version" : "3.4.1"
}
},
{
"identity" : "interop-ios-for-google-sdks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
"state" : {
"revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
"version" : "100.0.0"
}
},
{
"identity" : "kakao-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kakao/kakao-ios-sdk.git",
"state" : {
"revision" : "9f3a186d10619ff14e08ae8e44a59919624abe8b",
"version" : "2.17.0"
"revision" : "ab226a7a3625d64e73a52aa3800595dab810156b",
"version" : "2.22.1"
}
},
{
"identity" : "kakao-ios-sdk-rx",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kakao/kakao-ios-sdk-rx",
"state" : {
"revision" : "818bf4def2e51776dc92dc6de96301d4082f9234",
"version" : "2.17.0"
"revision" : "f7c88fc197529464302a75ee351d105975d18bf6",
"version" : "2.22.1"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
"version" : "1.22.2"
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
"identity" : "lottie-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/airbnb/lottie-ios.git",
"state" : {
"revision" : "1760543c6e48e13fc76e9343f7006bcaee498a78",
"version" : "4.3.1"
"revision" : "769b88d83a42ca8d5572b020c96f47e3690b3796",
"version" : "4.4.3"
}
},
{
Expand All @@ -115,16 +132,16 @@
"location" : "https://github.com/Moya/Moya",
"state" : {
"branch" : "master",
"revision" : "963654cd4f82d17d7546b9d6127c29f6df091717"
"revision" : "10a9dd1577c4de5135a29f99410863d2e9ee034a"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
"version" : "2.30909.0"
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
}
},
{
Expand All @@ -141,8 +158,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
},
{
Expand Down Expand Up @@ -178,7 +195,7 @@
"location" : "https://github.com/ReactiveX/RxSwift",
"state" : {
"branch" : "main",
"revision" : "2ff073fc1b9c600ac9b54734aff3348110437c19"
"revision" : "bfe5015ba3539ae6040db059f976650ed117aa13"
}
},
{
Expand All @@ -187,16 +204,16 @@
"location" : "https://github.com/SnapKit/SnapKit",
"state" : {
"branch" : "develop",
"revision" : "58320fe80522414bf3a7e24c88123581dc586752"
"revision" : "2842e6e84e82eb9a8dac0100ca90d9444b0307f4"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "ce20dc083ee485524b802669890291c0d8090170",
"version" : "1.22.1"
"revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
"version" : "1.26.0"
}
},
{
Expand All @@ -209,5 +226,5 @@
}
}
],
"version" : 3
"version" : 2
}
28 changes: 14 additions & 14 deletions Milestone/Milestone/Core/Services/ServicesGoalList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ extension ServicesGoalList {
}

func requestGoalCountByStatus() -> Observable<Result<BaseModel<UpperGoalCount>, APIError>> {
return Observable.just(
.success(
.init(
code: 200,
message: "fetch 성공!",
data: .init(
counts: .init(
STORE: 1, PROCESS: 1, COMPLETE: 1
)
)
)
)
)
// return apiSession.request(.requestGoalCountByStatus)
// return Observable.just(
// .success(
// .init(
// code: 200,
// message: "fetch 성공!",
// data: .init(
// counts: .init(
// STORE: 1, PROCESS: 1, COMPLETE: 1
// )
// )
// )
// )
// )
return apiSession.request(.requestGoalCountByStatus)
}

func requestPostUpperGoal(reqBody: CreateUpperGoal) -> Observable<Result<EmptyDataModel, APIError>> {
Expand Down
Loading

0 comments on commit c3b07e0

Please sign in to comment.