Skip to content

Commit

Permalink
Merge pull request #80 from Team-Clody/fix/#79-release
Browse files Browse the repository at this point in the history
Fix [#79] v1.0.0 릴리즈 리젝 사항 반영
  • Loading branch information
kim-seonwoo authored Aug 27, 2024
2 parents a36d27b + 47da7ce commit 7cbb146
Show file tree
Hide file tree
Showing 19 changed files with 270 additions and 476 deletions.
41 changes: 14 additions & 27 deletions Clody_iOS/Clody_iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@
2CE6378B2C3D546200B6EC6D /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE6378A2C3D546200B6EC6D /* AccountViewController.swift */; };
2CE6378D2C3D56A700B6EC6D /* AccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE6378C2C3D56A700B6EC6D /* AccountView.swift */; };
2CE637912C3D56C300B6EC6D /* AccountViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE637902C3D56C300B6EC6D /* AccountViewModel.swift */; };
952EB1902C6A301C00D1E516 /* EmailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952EB18F2C6A301C00D1E516 /* EmailViewController.swift */; };
952EB1922C6A309600D1E516 /* EmailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952EB1912C6A309600D1E516 /* EmailView.swift */; };
952EB1942C6A30CC00D1E516 /* EmailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952EB1932C6A30CC00D1E516 /* EmailViewModel.swift */; };
952EB1962C6A8DCD00D1E516 /* SignUpInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952EB1952C6A8DCD00D1E516 /* SignUpInfoModel.swift */; };
952EB1992C6BCF7E00D1E516 /* UIViewController+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952EB1982C6BCF7E00D1E516 /* UIViewController+.swift */; };
95310F722C3C39FE00023C7B /* ClodyNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310F712C3C39FE00023C7B /* ClodyNavigationBar.swift */; };
95310F742C3C765C00023C7B /* ClodyTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310F732C3C765C00023C7B /* ClodyTextField.swift */; };
Expand Down Expand Up @@ -214,6 +210,7 @@
0BABF7BD2C722313005A5CA1 /* AppVersionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersionManager.swift; sourceTree = "<group>"; };
0BC373522C3FCC2600C45072 /* ViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelType.swift; sourceTree = "<group>"; };
0BCD4FA22C35B59C006390D2 /* Clody_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Clody_iOS.entitlements; sourceTree = "<group>"; };
0BDF13BF2C7D612800BA2E7C /* Config_Dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config_Dev.xcconfig; sourceTree = "<group>"; };
0BE7E9E92C45B0B8000C5358 /* UserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManager.swift; sourceTree = "<group>"; };
0BE7E9EE2C461D0F000C5358 /* NotificationPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationPickerView.swift; sourceTree = "<group>"; };
0BE7E9F02C4636DE000C5358 /* CalendarMonthlyResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarMonthlyResponseDTO.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -256,10 +253,6 @@
2CE6378A2C3D546200B6EC6D /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; };
2CE6378C2C3D56A700B6EC6D /* AccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountView.swift; sourceTree = "<group>"; };
2CE637902C3D56C300B6EC6D /* AccountViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewModel.swift; sourceTree = "<group>"; };
952EB18F2C6A301C00D1E516 /* EmailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailViewController.swift; sourceTree = "<group>"; };
952EB1912C6A309600D1E516 /* EmailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailView.swift; sourceTree = "<group>"; };
952EB1932C6A30CC00D1E516 /* EmailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailViewModel.swift; sourceTree = "<group>"; };
952EB1952C6A8DCD00D1E516 /* SignUpInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpInfoModel.swift; sourceTree = "<group>"; };
952EB1982C6BCF7E00D1E516 /* UIViewController+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+.swift"; sourceTree = "<group>"; };
95310F712C3C39FE00023C7B /* ClodyNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClodyNavigationBar.swift; sourceTree = "<group>"; };
95310F732C3C765C00023C7B /* ClodyTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClodyTextField.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -353,6 +346,7 @@
0B20F3EA2C2C4DAB00F8D62D /* Info.plist */,
95310F892C401A1F00023C7B /* GoogleService-Info.plist */,
2CB129422C47F2CC009D1480 /* Config.xcconfig */,
0BDF13BF2C7D612800BA2E7C /* Config_Dev.xcconfig */,
);
path = Clody_iOS;
sourceTree = "<group>";
Expand Down Expand Up @@ -814,19 +808,10 @@
path = ViewModels;
sourceTree = "<group>";
};
952EB1972C6A8DD600D1E516 /* Models */ = {
isa = PBXGroup;
children = (
952EB1952C6A8DCD00D1E516 /* SignUpInfoModel.swift */,
);
path = Models;
sourceTree = "<group>";
};
95310F7D2C3FF37500023C7B /* Auth */ = {
isa = PBXGroup;
children = (
95310FBC2C44346500023C7B /* ViewModels */,
952EB1972C6A8DD600D1E516 /* Models */,
95310F812C3FF51600023C7B /* Views */,
95310F802C3FF50D00023C7B /* ViewControllers */,
);
Expand All @@ -837,7 +822,6 @@
isa = PBXGroup;
children = (
95310F7E2C3FF44E00023C7B /* LoginViewController.swift */,
952EB18F2C6A301C00D1E516 /* EmailViewController.swift */,
95310F8D2C401BED00023C7B /* TermsViewController.swift */,
95310F8F2C40705600023C7B /* NicknameViewController.swift */,
95310F932C40776200023C7B /* OnBoardingViewController.swift */,
Expand All @@ -851,7 +835,6 @@
isa = PBXGroup;
children = (
95310F822C3FF53400023C7B /* LoginView.swift */,
952EB1912C6A309600D1E516 /* EmailView.swift */,
95310F8B2C401BE200023C7B /* TermsView.swift */,
95310F912C40706600023C7B /* NicknameView.swift */,
95310F972C40777C00023C7B /* OnBoardingView.swift */,
Expand Down Expand Up @@ -920,7 +903,6 @@
isa = PBXGroup;
children = (
95310FBD2C4434B500023C7B /* LoginViewModel.swift */,
952EB1932C6A30CC00D1E516 /* EmailViewModel.swift */,
95310FBF2C44431800023C7B /* TermsViewModel.swift */,
95310FC12C45453F00023C7B /* NicknameViewModel.swift */,
95310FC32C45A31700023C7B /* DiaryNotificationViewModel.swift */,
Expand Down Expand Up @@ -1069,7 +1051,6 @@
95310F762C3C97A800023C7B /* ClodyBottomButton.swift in Sources */,
0B72DA2E2C46C13E00292173 /* NotificationViewModel.swift in Sources */,
0B6C074B2C3DC3070054A0B0 /* ListCollectionViewCell.swift in Sources */,
952EB1962C6A8DCD00D1E516 /* SignUpInfoModel.swift in Sources */,
0B4A1BC22C453FE700E31EC4 /* APIConstant.swift in Sources */,
95310FAB2C42D9EC00023C7B /* ReplyDetailViewController.swift in Sources */,
0B6C075D2C3E7D660054A0B0 /* WritingDiaryView.swift in Sources */,
Expand All @@ -1096,7 +1077,6 @@
0B4A1BD52C4546F800E31EC4 /* Config.swift in Sources */,
0BAAC6532C43D74D00174A9D /* ClodyToast.swift in Sources */,
2CE6378B2C3D546200B6EC6D /* AccountViewController.swift in Sources */,
952EB1922C6A309600D1E516 /* EmailView.swift in Sources */,
0B4EF9D12C48C39600CAF1F6 /* PermissionManager.swift in Sources */,
95310F7C2C3DD36100023C7B /* ClodyPickerView.swift in Sources */,
95310FB72C43B07100023C7B /* ReplyWaitingViewModel.swift in Sources */,
Expand Down Expand Up @@ -1154,12 +1134,10 @@
0BE7E9FE2C4660E7000C5358 /* GetReplyResponseDTO.swift in Sources */,
0B6C075B2C3E7D570054A0B0 /* WritingDiaryViewController.swift in Sources */,
0BE7EA002C4664EC000C5358 /* LoginRequestDTO.swift in Sources */,
952EB1942C6A30CC00D1E516 /* EmailViewModel.swift in Sources */,
952EB1992C6BCF7E00D1E516 /* UIViewController+.swift in Sources */,
0B6C07432C3DC2DE0054A0B0 /* ListModel.swift in Sources */,
0B17F8052C368465008A9998 /* DailyCalendarCollectionViewCell.swift in Sources */,
0B190F0D2C38111500D46CFC /* CalendarDailyModel.swift in Sources */,
952EB1902C6A301C00D1E516 /* EmailViewController.swift in Sources */,
0BE7E9EF2C461D0F000C5358 /* NotificationPickerView.swift in Sources */,
95310FC02C44431800023C7B /* TermsViewModel.swift in Sources */,
95310F942C40776200023C7B /* OnBoardingViewController.swift in Sources */,
Expand Down Expand Up @@ -1208,7 +1186,7 @@
/* Begin XCBuildConfiguration section */
0B20F3EB2C2C4DAB00F8D62D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2CB129422C47F2CC009D1480 /* Config.xcconfig */;
baseConfigurationReference = 0BDF13BF2C7D612800BA2E7C /* Config_Dev.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
Expand Down Expand Up @@ -1259,6 +1237,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_KEY_CFBundleDisplayName = "클로디Dev";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -1316,6 +1295,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_KEY_CFBundleDisplayName = "클로디";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down Expand Up @@ -1352,9 +1332,12 @@
PRODUCT_BUNDLE_IDENTIFIER = com.Clody.Clody;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
};
Expand Down Expand Up @@ -1385,9 +1368,13 @@
PRODUCT_BUNDLE_IDENTIFIER = com.Clody.Clody;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = RELEASE;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
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 = "0B20F3D82C2C4DAA00F8D62D"
BuildableName = "Clody_iOS.app"
BlueprintName = "Clody_iOS"
ReferencedContainer = "container:Clody_iOS.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 = "Release"
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 = "0B20F3D82C2C4DAA00F8D62D"
BuildableName = "Clody_iOS.app"
BlueprintName = "Clody_iOS"
ReferencedContainer = "container:Clody_iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B20F3D82C2C4DAA00F8D62D"
BuildableName = "Clody_iOS.app"
BlueprintName = "Clody_iOS"
ReferencedContainer = "container:Clody_iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
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 = "0B20F3D82C2C4DAA00F8D62D"
BuildableName = "Clody_iOS.app"
BlueprintName = "Clody_iOS"
ReferencedContainer = "container:Clody_iOS.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 = "0B20F3D82C2C4DAA00F8D62D"
BuildableName = "Clody_iOS.app"
BlueprintName = "Clody_iOS"
ReferencedContainer = "container:Clody_iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B20F3D82C2C4DAA00F8D62D"
BuildableName = "Clody_iOS.app"
BlueprintName = "Clody_iOS"
ReferencedContainer = "container:Clody_iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Debug"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
1 change: 1 addition & 0 deletions Clody_iOS/Clody_iOS/Global/Literals/String.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ enum I18N {
static let placeHolder = "일상 속 작은 감사함을 적어보세요."
static let helpMessage = "신조어, 비속어, 이모지 작성은 불가능해요"
static let replyButton = "답장 확인"
static let inputLimitError = "2~50자까지 입력할 수 있어요."
}

enum Calendar {
Expand Down
6 changes: 6 additions & 0 deletions Clody_iOS/Clody_iOS/Global/Manager/UserManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,19 @@ final class UserManager {
set { keychain["fcmToken"] = newValue }
}

var appleEmail: String? {
get { return keychain["appleEmail"] }
set { keychain["appleEmail"] = newValue }
}

var hasAccessToken: Bool { return self.accessToken != nil }
var accessTokenValue: String { return self.accessToken ?? "" }
var refreshTokenValue: String { return self.refreshToken ?? "" }
var authCodeValue: String { return self.authCode ?? "" }
var idTokenValue: String { return self.idToken ?? "" }
var platformValue: String { return self.platform ?? "" }
var fcmTokenValue: String { return self.fcmToken ?? "" }
var appleEmailValue: String { return self.appleEmail ?? "" }
}

extension UserManager {
Expand Down
14 changes: 0 additions & 14 deletions Clody_iOS/Clody_iOS/Presentation/Auth/Models/SignUpInfoModel.swift

This file was deleted.

Loading

0 comments on commit 7cbb146

Please sign in to comment.