Skip to content
Merged

2.0.1 #141

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
CB78A80F2B5D0CBD007EC9C1 /* FollowUsecase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowUsecase.swift; sourceTree = "<group>"; };
CB78A8112B5D0F07007EC9C1 /* Token.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Token.swift; sourceTree = "<group>"; };
CB78A8152B5D5511007EC9C1 /* SettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingView.swift; sourceTree = "<group>"; };
CB7F3321298A4F1E0000A6B4 /* FoodBowl.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FoodBowl.entitlements; sourceTree = "<group>"; };
CB7F3321298A4F1E0000A6B4 /* Dot.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Dot.entitlements; sourceTree = "<group>"; };
CB7F3324298A51560000A6B4 /* UserDefaultStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultStorage.swift; sourceTree = "<group>"; };
CB7F3326298A51610000A6B4 /* UserDefaultHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultHandler.swift; sourceTree = "<group>"; };
CB811AA52B66DE7200DCCA49 /* SignAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignAPI.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -400,7 +400,7 @@
CBC158652AD80BB600FD263B /* MemberDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberDTO.swift; sourceTree = "<group>"; };
CBC158672AD80C3300FD263B /* CreateBlameRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateBlameRequestDTO.swift; sourceTree = "<group>"; };
CBC19D492B6FA2FB009CB3AB /* EmptyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyListView.swift; sourceTree = "<group>"; };
CBC73100295550A100C7F198 /* FoodBowl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FoodBowl.app; sourceTree = BUILT_PRODUCTS_DIR; };
CBC73100295550A100C7F198 /* Dot.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Dot.app; sourceTree = BUILT_PRODUCTS_DIR; };
CBC73103295550A100C7F198 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
CBC73105295550A100C7F198 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
CBC7310C295550A200C7F198 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1293,23 +1293,23 @@
CBC730F7295550A100C7F198 = {
isa = PBXGroup;
children = (
CBC73102295550A100C7F198 /* FoodBowl */,
CBC73102295550A100C7F198 /* Dot */,
CBC73101295550A100C7F198 /* Products */,
);
sourceTree = "<group>";
};
CBC73101295550A100C7F198 /* Products */ = {
isa = PBXGroup;
children = (
CBC73100295550A100C7F198 /* FoodBowl.app */,
CBC73100295550A100C7F198 /* Dot.app */,
);
name = Products;
sourceTree = "<group>";
};
CBC73102295550A100C7F198 /* FoodBowl */ = {
CBC73102295550A100C7F198 /* Dot */ = {
isa = PBXGroup;
children = (
CB7F3321298A4F1E0000A6B4 /* FoodBowl.entitlements */,
CB7F3321298A4F1E0000A6B4 /* Dot.entitlements */,
CB617A1E2AE2387C000F7FFC /* App */,
CB617A1F2AE238AB000F7FFC /* Presentation */,
CB617A2A2AE23B01000F7FFC /* Domain */,
Expand All @@ -1318,7 +1318,7 @@
CB617A2B2AE23B89000F7FFC /* Utils */,
CBADC26F29559BC900E56C93 /* Resource */,
);
path = FoodBowl;
path = Dot;
sourceTree = "<group>";
};
CBC747AD2A83D9BC00F171F5 /* Request */ = {
Expand Down Expand Up @@ -1622,9 +1622,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
CBC730FF295550A100C7F198 /* FoodBowl */ = {
CBC730FF295550A100C7F198 /* Dot */ = {
isa = PBXNativeTarget;
buildConfigurationList = CBC73114295550A200C7F198 /* Build configuration list for PBXNativeTarget "FoodBowl" */;
buildConfigurationList = CBC73114295550A200C7F198 /* Build configuration list for PBXNativeTarget "Dot" */;
buildPhases = (
CBC730FC295550A100C7F198 /* Sources */,
CBC730FD295550A100C7F198 /* Frameworks */,
Expand All @@ -1634,7 +1634,7 @@
);
dependencies = (
);
name = FoodBowl;
name = Dot;
packageProductDependencies = (
CBADC2412955989400E56C93 /* SnapKit */,
CBADC244295598A200E56C93 /* Then */,
Expand All @@ -1647,7 +1647,7 @@
CBDF0D052AE8E6B600177D38 /* YPImagePicker */,
);
productName = FoodBowl;
productReference = CBC73100295550A100C7F198 /* FoodBowl.app */;
productReference = CBC73100295550A100C7F198 /* Dot.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -1665,7 +1665,7 @@
};
};
};
buildConfigurationList = CBC730FB295550A100C7F198 /* Build configuration list for PBXProject "FoodBowl" */;
buildConfigurationList = CBC730FB295550A100C7F198 /* Build configuration list for PBXProject "Dot" */;
compatibilityVersion = "Xcode 14.0";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand All @@ -1687,7 +1687,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
CBC730FF295550A100C7F198 /* FoodBowl */,
CBC730FF295550A100C7F198 /* Dot */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -1994,7 +1994,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_KEY_CFBundleDisplayName = "풋볼";
INFOPLIST_KEY_CFBundleDisplayName = Dot;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -2051,7 +2051,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_KEY_CFBundleDisplayName = "풋볼";
INFOPLIST_KEY_CFBundleDisplayName = Dot;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
Expand All @@ -2067,13 +2067,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BASE_URL = "http://cobyserver.iptime.org";
CODE_SIGN_ENTITLEMENTS = FoodBowl/FoodBowl.entitlements;
BASE_URL = "https://justdoeat.co.kr";
CODE_SIGN_ENTITLEMENTS = Dot/Dot.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 3Y8YH8GWMM;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FoodBowl/App/Info.plist;
INFOPLIST_FILE = Dot/App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Dot;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
INFOPLIST_KEY_NSCameraUsageDescription = "음식 사진을 찍기 위해, 권한이 필요합니다.";
Expand All @@ -2092,7 +2092,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.0;
MARKETING_VERSION = 2.0.1;
NONCE = wH_pSu5wSUHzoFPBUE9Q9ZRs3fcKzGSn;
PRODUCT_BUNDLE_IDENTIFIER = com.coby.FoodBowl;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -2110,13 +2110,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BASE_URL = "http://cobyserver.iptime.org";
CODE_SIGN_ENTITLEMENTS = FoodBowl/FoodBowl.entitlements;
BASE_URL = "https://justdoeat.co.kr";
CODE_SIGN_ENTITLEMENTS = Dot/Dot.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 3Y8YH8GWMM;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FoodBowl/App/Info.plist;
INFOPLIST_FILE = Dot/App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Dot;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
INFOPLIST_KEY_NSCameraUsageDescription = "음식 사진을 찍기 위해, 권한이 필요합니다.";
Expand All @@ -2135,7 +2135,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.0;
MARKETING_VERSION = 2.0.1;
NONCE = wH_pSu5wSUHzoFPBUE9Q9ZRs3fcKzGSn;
PRODUCT_BUNDLE_IDENTIFIER = com.coby.FoodBowl;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -2151,7 +2151,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
CBC730FB295550A100C7F198 /* Build configuration list for PBXProject "FoodBowl" */ = {
CBC730FB295550A100C7F198 /* Build configuration list for PBXProject "Dot" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CBC73112295550A200C7F198 /* Debug */,
Expand All @@ -2160,7 +2160,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
CBC73114295550A200C7F198 /* Build configuration list for PBXNativeTarget "FoodBowl" */ = {
CBC73114295550A200C7F198 /* Build configuration list for PBXNativeTarget "Dot" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CBC73115295550A200C7F198 /* Debug */,
Expand Down
78 changes: 78 additions & 0 deletions Dot.xcodeproj/xcshareddata/xcschemes/Dot.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1610"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CBC730FF295550A100C7F198"
BuildableName = "Dot.app"
BlueprintName = "Dot"
ReferencedContainer = "container:Dot.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CBC730FF295550A100C7F198"
BuildableName = "Dot.app"
BlueprintName = "Dot"
ReferencedContainer = "container:Dot.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CBC730FF295550A100C7F198"
BuildableName = "Dot.app"
BlueprintName = "Dot"
ReferencedContainer = "container:Dot.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
File renamed without changes.
File renamed without changes.
File renamed without changes.
22 changes: 0 additions & 22 deletions FoodBowl/App/Info.plist → Dot/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,6 @@
<string>$(KAKAO_TOKEN)</string>
<key>KakaoURL</key>
<string>$(KAKAO_URL)</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>place.map.kakao.com</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
<key>cobyserver.iptime.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSExceptionRequiresForwardSecrecy</key>
<false/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>Nonce</key>
<string>$(NONCE)</string>
<key>UIApplicationSceneManifest</key>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ final class MapViewModel: NSObject {
guard let location = self.location else { return }
if self.currentpageSize < self.pageSize { return }

let reviews = try await self.usecase.getReviewsByFollowing(request: GetReviewsRequestDTO(
let reviews = try await self.usecase.getReviewsByBookmark(request: GetReviewsRequestDTO(
location: location,
lastReviewId: lastReviewId,
pageSize: self.pageSize,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ final class ReviewDetailView: UIView, BaseViewType {
var userInfoButtonDidTapPublisher: AnyPublisher<Void, Never> {
return self.userInfoButton.buttonTapPublisher
}
var optionButtonDidTapPublisher: AnyPublisher<Void, Never> {
return self.userInfoButton.buttonTapPublisher
}
var storeInfoButtonDidTapPublisher: AnyPublisher<Void, Never> {
return self.storeInfoButton.buttonTapPublisher
}
Expand Down Expand Up @@ -83,6 +80,10 @@ final class ReviewDetailView: UIView, BaseViewType {
self.storeInfoButton
}

func userInfo() -> UserInfoButton {
self.userInfoButton
}

private func setupExistImageUI() {
self.contentView.addSubviews(
self.userInfoButton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ final class ReviewDetailViewController: UIViewController, Navigationable {
})
.store(in: &self.cancellable)

self.reviewDetailView.optionButtonDidTapPublisher
self.reviewDetailView.userInfo().optionButtonDidTapPublisher
.receive(on: DispatchQueue.main)
.sink(receiveValue: { [weak self] _ in
guard let self = self else { return }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ extension ReviewDetailViewModel: ReviewDetailViewModelType {
onUpdate: @escaping () -> Void,
onDelete: @escaping () -> Void
) {
if self.memberId == UserDefaultStorage.id {
if let memberId = self.memberId, memberId == UserDefaultStorage.id {
self.presentMyReviewOptionAlert(onUpdate: onUpdate, onDelete: onDelete)
} else {
self.presentReviewOptionAlert(onBlame: onBlame)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,11 @@ extension UIViewController {
return "네트워크 통신에 실패하였습니다."
}
}

let alertViewController = UIAlertController(title: title, message: message, preferredStyle: .alert)
let okAction = UIAlertAction(title: "확인", style: .default, handler: okAction)
alertViewController.addAction(okAction)

self.present(alertViewController, animated: true, completion: completion)
}
}
Loading