Skip to content

Commit

Permalink
Merge branch 'develop' into feat/#189-reportAndPopular
Browse files Browse the repository at this point in the history
  • Loading branch information
boogios authored Jun 16, 2024
2 parents e625ab4 + b599b06 commit 24c3fa9
Show file tree
Hide file tree
Showing 21 changed files with 427 additions and 44 deletions.
35 changes: 31 additions & 4 deletions DontBe-iOS/DontBe-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
052555BC2C1218A800D38E34 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 052555BB2C1218A800D38E34 /* GoogleService-Info.plist */; };
052555BF2C121A5200D38E34 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 052555BE2C121A5200D38E34 /* FirebaseMessaging */; };
052555C42C187A7400D38E34 /* DontBePushAlarmHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 052555C32C187A7400D38E34 /* DontBePushAlarmHelper.swift */; };
05D2B97F2C0A3D8400453615 /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 05D2B97E2C0A3D8400453615 /* Config.xcconfig */; };
2A0A730A2B541555004478C1 /* HttpMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0A73092B541555004478C1 /* HttpMethod.swift */; };
2A0A730C2B541A43004478C1 /* NetworkServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0A730B2B541A43004478C1 /* NetworkServiceType.swift */; };
2A0A730E2B5438B5004478C1 /* KeychainWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0A730D2B5438B5004478C1 /* KeychainWrapper.swift */; };
Expand Down Expand Up @@ -169,6 +173,9 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
052555BB2C1218A800D38E34 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
052555C32C187A7400D38E34 /* DontBePushAlarmHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBePushAlarmHelper.swift; sourceTree = "<group>"; };
05D2B97E2C0A3D8400453615 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
2A0A73092B541555004478C1 /* HttpMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpMethod.swift; sourceTree = "<group>"; };
2A0A730B2B541A43004478C1 /* NetworkServiceType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkServiceType.swift; sourceTree = "<group>"; };
2A0A730D2B5438B5004478C1 /* KeychainWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainWrapper.swift; sourceTree = "<group>"; };
Expand All @@ -180,7 +187,6 @@
2A2671FE2B4C3AF0009D214F /* Publisher+UIControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Publisher+UIControl.swift"; sourceTree = "<group>"; };
2A2672012B4C3B44009D214F /* ViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelType.swift; sourceTree = "<group>"; };
2A2672042B4C3C00009D214F /* CancelBag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CancelBag.swift; sourceTree = "<group>"; };
2A26720D2B4C40CE009D214F /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
2A28453D2B531DDE0023F9B5 /* NetworkService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkService.swift; sourceTree = "<group>"; };
2A28453F2B531F0A0023F9B5 /* BaseResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseResponse.swift; sourceTree = "<group>"; };
2A2845422B5320070023F9B5 /* SocialLoginResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialLoginResponseDTO.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -334,6 +340,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
052555BF2C121A5200D38E34 /* FirebaseMessaging in Frameworks */,
2AAA845F2B494AC50098A824 /* SnapKit in Frameworks */,
2A8D70B12B4C4D8F009F4C6C /* KakaoSDK in Frameworks */,
3CFB30472BB305EE00A3F70A /* Amplitude in Frameworks */,
Expand Down Expand Up @@ -778,7 +785,7 @@
3C6192E02B3A719A00220CEB = {
isa = PBXGroup;
children = (
2A26720D2B4C40CE009D214F /* Config.xcconfig */,
05D2B97E2C0A3D8400453615 /* Config.xcconfig */,
3C6192EB2B3A719A00220CEB /* DontBe-iOS */,
3C6192EA2B3A719A00220CEB /* Products */,
);
Expand All @@ -795,6 +802,7 @@
3C6192EB2B3A719A00220CEB /* DontBe-iOS */ = {
isa = PBXGroup;
children = (
052555BB2C1218A800D38E34 /* GoogleService-Info.plist */,
2AE95D702B81EC52009C6336 /* DontBe-iOS.entitlements */,
3C6193002B3A771E00220CEB /* Application */,
3C6193012B3A772B00220CEB /* Global */,
Expand Down Expand Up @@ -1128,6 +1136,7 @@
2A5220EB2B507F2A001510B7 /* UITableViewCellRegisterable.swift */,
2F65B72E2B84D68500775853 /* CopyableLabel.swift */,
2FD9276B2B9224FA0046193D /* DontBeLoadingView.swift */,
052555C32C187A7400D38E34 /* DontBePushAlarmHelper.swift */,
);
path = Helpers;
sourceTree = "<group>";
Expand Down Expand Up @@ -1227,6 +1236,7 @@
2FD927692B92245B0046193D /* Lottie */,
3CFB30462BB305EE00A3F70A /* Amplitude */,
3C5F82AF2BFB133700D2FE3F /* Kingfisher */,
052555BE2C121A5200D38E34 /* FirebaseMessaging */,
);
productName = DontBe;
productReference = 3C6192E92B3A719A00220CEB /* DontBe-iOS.app */;
Expand Down Expand Up @@ -1262,6 +1272,7 @@
2FD927682B92245B0046193D /* XCRemoteSwiftPackageReference "lottie-spm" */,
3CFB30452BB305EE00A3F70A /* XCRemoteSwiftPackageReference "Amplitude-iOS" */,
3C5F82AE2BFB133700D2FE3F /* XCRemoteSwiftPackageReference "Kingfisher" */,
052555BD2C121A5100D38E34 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
);
productRefGroup = 3C6192EA2B3A719A00220CEB /* Products */;
projectDirPath = "";
Expand All @@ -1278,9 +1289,11 @@
buildActionMask = 2147483647;
files = (
3C6192F62B3A719C00220CEB /* Assets.xcassets in Resources */,
05D2B97F2C0A3D8400453615 /* Config.xcconfig in Resources */,
2A6D54C72B493E3F00F9891E /* Pretendard-Regular.otf in Resources */,
2A6D54C62B493E3F00F9891E /* Pretendard-SemiBold.otf in Resources */,
2FD9276E2B9225EE0046193D /* loading_yesbe.json in Resources */,
052555BC2C1218A800D38E34 /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1314,6 +1327,7 @@
3CF4651B2B58398900997FCA /* PostTransparencyRequestDTO.swift in Sources */,
3C2F544E2B50F65500E7BF01 /* DontBeBottomSheetView.swift in Sources */,
2F05B1A72B5799B700AC368D /* PostDetailResponseDTO.swift in Sources */,
052555C42C187A7400D38E34 /* DontBePushAlarmHelper.swift in Sources */,
3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */,
2FB64FF22B5318C50082A414 /* WriteReplyContentView.swift in Sources */,
3C2245292BF34C1A0095D3FB /* DontBePhotoDetailView.swift in Sources */,
Expand Down Expand Up @@ -1451,7 +1465,6 @@
/* Begin XCBuildConfiguration section */
3C6192FB2B3A719C00220CEB /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2A26720D2B4C40CE009D214F /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
Expand Down Expand Up @@ -1515,7 +1528,6 @@
};
3C6192FC2B3A719C00220CEB /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2A26720D2B4C40CE009D214F /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
Expand Down Expand Up @@ -1572,6 +1584,7 @@
};
3C6192FE2B3A719C00220CEB /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 05D2B97E2C0A3D8400453615 /* Config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -1610,6 +1623,7 @@
};
3C6192FF2B3A719C00220CEB /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 05D2B97E2C0A3D8400453615 /* Config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -1670,6 +1684,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
052555BD2C121A5100D38E34 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 10.27.0;
};
};
2A8D70AF2B4C4D8F009F4C6C /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kakao/kakao-ios-sdk.git";
Expand Down Expand Up @@ -1713,6 +1735,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
052555BE2C121A5200D38E34 /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
package = 052555BD2C121A5100D38E34 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseMessaging;
};
2A8D70B02B4C4D8F009F4C6C /* KakaoSDK */ = {
isa = XCSwiftPackageProductDependency;
package = 2A8D70AF2B4C4D8F009F4C6C /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"originHash" : "74a68703609c00724d8fa5d77c9ef0723fac1493ecbf4612b13c4182b56fbd1f",
"originHash" : "d422629a9ac3cdec9ee477062856b08ee42e219c655a61567899a1d16c894513",
"pins" : [
{
"identity" : "abseil-cpp-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "748c7837511d0e6a507737353af268484e1745e2",
"version" : "1.2024011601.1"
}
},
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -28,6 +37,78 @@
"version" : "1.0.3"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
"version" : "10.19.1"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk.git",
"state" : {
"revision" : "8bcaf973b1d84e119b7c7c119abad72ed460979f",
"version" : "10.27.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "70df02431e216bed98dd461e0c4665889245ba70",
"version" : "10.27.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
"version" : "9.4.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
"version" : "7.13.3"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359",
"version" : "1.62.2"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"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",
Expand All @@ -46,6 +127,15 @@
"version" : "7.11.0"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
"identity" : "lottie-spm",
"kind" : "remoteSourceControl",
Expand All @@ -55,6 +145,24 @@
"version" : "4.4.3"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
}
},
{
"identity" : "promises",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
},
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
Expand All @@ -63,6 +171,15 @@
"revision" : "2842e6e84e82eb9a8dac0100ca90d9444b0307f4",
"version" : "5.7.1"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
"version" : "1.26.0"
}
}
],
"version" : 3
Expand Down
Loading

0 comments on commit 24c3fa9

Please sign in to comment.