Skip to content

Commit

Permalink
✨[feat]: 화면 전환 방식 변경 #13
Browse files Browse the repository at this point in the history 
* 신고 하기 로직  수정
  • Loading branch information
@Roy-wonji
Roy-wonji committed Oct 2, 2024
1 parent 331feae commit 5cdd7b2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 18 deletions.
8 changes: 4 additions & 4 deletions OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -509,14 +509,14 @@
6031D9519EC6FC01AAA5886A /* GoogleDataTransport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleDataTransport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
60B0C1283CB30AAF071C5C53 /* GoogleAppMeasurementTarget.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleAppMeasurementTarget.framework; sourceTree = BUILT_PRODUCTS_DIR; };
60B637CBABAD087480661558 /* AppDIContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDIContainer.swift; sourceTree = "<group>"; };
64FC3934D7F31766E2859437 /* GoogleAppMeasurementIdentitySupport.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = GoogleAppMeasurementIdentitySupport.xcframework; sourceTree = "<group>"; };
64FC3934D7F31766E2859437 /* GoogleAppMeasurementIdentitySupport.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:EQHXZ8M8AV:Google LLC"; lastKnownFileType = wrapper.xcframework; path = GoogleAppMeasurementIdentitySupport.xcframework; sourceTree = "<group>"; };
65E1CBB94F98F3F822EBDA8A /* Cryptor.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Cryptor.framework; sourceTree = BUILT_PRODUCTS_DIR; };
666517ACAEAFE67DE9DE1F99 /* ThirdParty.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ThirdParty.framework; sourceTree = BUILT_PRODUCTS_DIR; };
66E408F6FE139A5449BB799B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
697B8FCF31717CABCDD5C879 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
6D9BE4AB849FDC214806C108 /* CombineMoya.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CombineMoya.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6FA69F98539B6C93DFF8B85B /* FirebaseCrashlyticsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseCrashlyticsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7045A18C58DE5AB0F9204357 /* FirebaseAnalytics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = FirebaseAnalytics.xcframework; sourceTree = "<group>"; };
7045A18C58DE5AB0F9204357 /* FirebaseAnalytics.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:EQHXZ8M8AV:Google LLC"; lastKnownFileType = wrapper.xcframework; path = FirebaseAnalytics.xcframework; sourceTree = "<group>"; };
70CEE66DE71E36764B066F7F /* ThirdPartys.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ThirdPartys.framework; sourceTree = BUILT_PRODUCTS_DIR; };
710544D3689288D88BCF4D7F /* _RopeModule.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = _RopeModule.framework; sourceTree = BUILT_PRODUCTS_DIR; };
725C4353C0319CF46F69E133 /* Networkings.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Networkings.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -537,7 +537,7 @@
8A62E719CD13379021A1018E /* ComposableArchitecture.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ComposableArchitecture.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8F951859C16300D718D790CE /* FirebaseCoreExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseCoreExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
924356B9EA4A57FBE1A8AA1B /* GoogleUtilities_MethodSwizzler.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleUtilities_MethodSwizzler.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9B972B2EAFA06F54BDD18D7B /* GoogleAppMeasurement.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = GoogleAppMeasurement.xcframework; sourceTree = "<group>"; };
9B972B2EAFA06F54BDD18D7B /* GoogleAppMeasurement.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:EQHXZ8M8AV:Google LLC"; lastKnownFileType = wrapper.xcframework; path = GoogleAppMeasurement.xcframework; sourceTree = "<group>"; };
9C06F7F21BD7127787F49F8C /* Promises.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Promises.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9E449D7F0BCB1EBCA64659E1 /* Firebase_FirebaseCrashlytics.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Firebase_FirebaseCrashlytics.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
9FE851A49FEDC5B110848E6A /* GoogleUtilities_GoogleUtilities_Network.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GoogleUtilities_GoogleUtilities_Network.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down
5 changes: 5 additions & 0 deletions ...Projects/Presentation/Presentation/Sources/Home/Coordinator/Reducer/HomeCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,15 @@ public struct HomeCoordinator {
state.routes.push(.createQuestion(.init()))
return .none

//MARK: - 신고하기
case .routeAction(id: _, action: .home(.navigation(.presntReport))):
state.routes.push(.report(.init(questionID: state.questionID)))
return .none

case .routeAction(id: _, action: .report(.navigation(.presntMainHome))):
state.routes.goBackToRoot()
return .none

//MARK: - 프로필 화면
//MARK: - logout
case .routeAction(id: _, action: .profile(.navigation(.presntLogout))):
Expand Down
4 changes: 2 additions & 2 deletions OPeace/Projects/Presentation/Presentation/Sources/Home/Report/Reducer/Report.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public struct Report {
var reportButtonComplete: String = "완료"
var reportQuestionModel: ReportQuestionModel? = nil

@Shared(.inMemory("isReportQuestion")) var isReportQuestion: Bool = false
@Shared(.inMemory("userInfoModel")) var userInfoModel: UserInfoModel? = .init()
@Shared var questionID: Int

public init(
Expand Down Expand Up @@ -112,7 +112,7 @@ public struct Report {
switch result {
case .success(let reportQuestionResult):
state.reportQuestionModel = reportQuestionResult
state.isReportQuestion = true
state.userInfoModel?.isReportQuestion = true
case .failure(let error):
Log.error("질문 신고 실패", error.localizedDescription)
}
Expand Down
24 changes: 12 additions & 12 deletions OPeace/fastlane/report.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,62 +5,62 @@



<testcase classname="fastlane.lanes" name="00: update_fastlane" time="5.059421">
<testcase classname="fastlane.lanes" name="00: update_fastlane" time="5.162191">

</testcase>


<testcase classname="fastlane.lanes" name="01: default_platform" time="9.6e-05">
<testcase classname="fastlane.lanes" name="01: default_platform" time="9.9e-05">

</testcase>


<testcase classname="fastlane.lanes" name="02: app_store_connect_api_key" time="0.002232">
<testcase classname="fastlane.lanes" name="02: app_store_connect_api_key" time="0.001597">

</testcase>


<testcase classname="fastlane.lanes" name="03: match" time="6.364793">
<testcase classname="fastlane.lanes" name="03: match" time="9.444626">

</testcase>


<testcase classname="fastlane.lanes" name="04: Switch to ios build_ipa lane" time="0.0001">
<testcase classname="fastlane.lanes" name="04: Switch to ios build_ipa lane" time="9.1e-05">

</testcase>


<testcase classname="fastlane.lanes" name="05: clear_derived_data" time="2.659525">
<testcase classname="fastlane.lanes" name="05: clear_derived_data" time="32.498576">

</testcase>


<testcase classname="fastlane.lanes" name="06: build_app" time="253.933568">
<testcase classname="fastlane.lanes" name="06: build_app" time="240.948199">

</testcase>


<testcase classname="fastlane.lanes" name="07: upload_to_testflight" time="101.314028">
<testcase classname="fastlane.lanes" name="07: upload_to_testflight" time="104.131109">

</testcase>


<testcase classname="fastlane.lanes" name="08: Switch to ios send_slack lane" time="0.000538">
<testcase classname="fastlane.lanes" name="08: Switch to ios send_slack lane" time="0.000817">

</testcase>


<testcase classname="fastlane.lanes" name="09: get_version_number" time="0.066912">
<testcase classname="fastlane.lanes" name="09: get_version_number" time="0.062228">

</testcase>


<testcase classname="fastlane.lanes" name="10: latest_testflight_build_number" time="1.199356">
<testcase classname="fastlane.lanes" name="10: latest_testflight_build_number" time="1.297741">

</testcase>


<testcase classname="fastlane.lanes" name="11: slack" time="0.794021">
<testcase classname="fastlane.lanes" name="11: slack" time="0.771321">

</testcase>

Expand Down

0 comments on commit 5cdd7b2

Please sign in to comment.