Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Write Curation View UI 변경사항 #351

Merged
merged 18 commits into from
Dec 1, 2022
Merged

Write Curation View UI 변경사항 #351

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7264a9a
Merge pull request #229 from DeveloperAcademy-POSTECH/develop
HanGyeongjun Nov 7, 2022
17aa357
Merge remote-tracking branch 'refs/remotes/origin/develop'
HanGyeongjun Nov 8, 2022
bc1982d
[feat] Updata Version Info to 1.0.1(4)
HanGyeongjun Nov 8, 2022
565cb9c
Merge remote-tracking branch 'refs/remotes/origin/develop'
HanGyeongjun Nov 9, 2022
d3ae5d1
[Release] Update 1.0.1(5) distribution settings
HanGyeongjun Nov 9, 2022
2a77c67
Merge remote-tracking branch 'refs/remotes/origin/develop'
HanGyeongjun Nov 22, 2022
cab0b63
[Release] Update 1.1.0(1) distribution settings
HanGyeongjun Nov 22, 2022
5b50d30
Merge remote-tracking branch 'refs/remotes/origin/develop'
HanGyeongjun Nov 23, 2022
a59b168
[Release] Update 1.1.0(2) distribution settings
HanGyeongjun Nov 23, 2022
607179d
[Feat] #342 Update WriteShortcutView UI
HanGyeongjun Nov 29, 2022
5ecbfc8
Merge remote-tracking branch 'refs/remotes/origin/main'
HanGyeongjun Nov 29, 2022
068d80d
[Feat] #342 fix valid option
HanGyeongjun Nov 29, 2022
2382984
[Fix] #342 fix my mistake
HanGyeongjun Nov 29, 2022
26751f9
Merge remote-tracking branch 'refs/remotes/origin/develop'
HanGyeongjun Nov 29, 2022
2ad8363
[Feat] #342 Update UI
HanGyeongjun Nov 30, 2022
e9b41b8
[Feat] #342 fix errors
HanGyeongjun Dec 1, 2022
35265bf
Merge remote-tracking branch 'refs/remotes/origin/develop'
HanGyeongjun Dec 1, 2022
26ab3c1
[Fix] #342 add button style
HanGyeongjun Dec 1, 2022
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
14 changes: 7 additions & 7 deletions HappyAnding/HappyAnding.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
A0F822AC2910B8F100AF4448 /* ShortcutsZipViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0F822AB2910B8F100AF4448 /* ShortcutsZipViewModel.swift */; };
A0F822B729164D2300AF4448 /* ShortcutsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0F822B629164D2300AF4448 /* ShortcutsListView.swift */; };
A33F74AE2908D8C800B8D0D0 /* CheckBoxShortcutCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33F74AD2908D8C800B8D0D0 /* CheckBoxShortcutCell.swift */; };
A35C39542936928200C4359F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A35C39532936928200C4359F /* GoogleService-Info.plist */; };
A3766B232904330300708F83 /* ReadUserCurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3766B222904330300708F83 /* ReadUserCurationView.swift */; };
A38115BA292B447D0043E8B8 /* ShortcutCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38115B9292B447D0043E8B8 /* ShortcutCardCell.swift */; };
A3B2636A2909DFD200829DE1 /* CurationListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B263692909DFD200829DE1 /* CurationListView.swift */; };
A3C55771292D1C0B003907DC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A3C55770292D1C0A003907DC /* GoogleService-Info.plist */; };
A3FF0183291648A300384211 /* MailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FF0182291648A300384211 /* MailView.swift */; };
A3FF01862918552E00384211 /* AboutTeamView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FF01852918552E00384211 /* AboutTeamView.swift */; };
A3FF01882918581E00384211 /* LicenseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FF01872918581E00384211 /* LicenseView.swift */; };
Expand Down Expand Up @@ -195,10 +195,10 @@
A0F822AB2910B8F100AF4448 /* ShortcutsZipViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutsZipViewModel.swift; sourceTree = "<group>"; };
A0F822B629164D2300AF4448 /* ShortcutsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutsListView.swift; sourceTree = "<group>"; };
A33F74AD2908D8C800B8D0D0 /* CheckBoxShortcutCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBoxShortcutCell.swift; sourceTree = "<group>"; };
A35C39532936928200C4359F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
A3766B222904330300708F83 /* ReadUserCurationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadUserCurationView.swift; sourceTree = "<group>"; };
A38115B9292B447D0043E8B8 /* ShortcutCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutCardCell.swift; sourceTree = "<group>"; };
A3B263692909DFD200829DE1 /* CurationListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurationListView.swift; sourceTree = "<group>"; };
A3C55770292D1C0A003907DC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
A3FF0182291648A300384211 /* MailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailView.swift; sourceTree = "<group>"; };
A3FF01852918552E00384211 /* AboutTeamView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutTeamView.swift; sourceTree = "<group>"; };
A3FF01872918581E00384211 /* LicenseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LicenseView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -260,7 +260,7 @@
87E99C6128F94EA6009B691F = {
isa = PBXGroup;
children = (
A3C55770292D1C0A003907DC /* GoogleService-Info.plist */,
A35C39532936928200C4359F /* GoogleService-Info.plist */,
87E99C6C28F94EA6009B691F /* HappyAnding */,
87E99C7D28F94EA8009B691F /* HappyAndingTests */,
87E99C8728F94EA8009B691F /* HappyAndingUITests */,
Expand Down Expand Up @@ -322,9 +322,9 @@
isa = PBXGroup;
children = (
87E99CB828FFF291009B691F /* WriteShortcutTitleView.swift */,
87E99CBA28FFF298009B691F /* IconModalView.swift */,
87E99CBC28FFF2A1009B691F /* WriteShortcutdescriptionView.swift */,
87E99CBE28FFF2AB009B691F /* WriteShortcutTagView.swift */,
87E99CBA28FFF298009B691F /* IconModalView.swift */,
87E99CC028FFF2B5009B691F /* CategoryModalView.swift */,
);
path = WriteShortcutViews;
Expand Down Expand Up @@ -630,7 +630,7 @@
F90DEA5029327E5D002140E2 /* Assets.xcassets in Resources */,
87E99C7528F94EA8009B691F /* Preview Assets.xcassets in Resources */,
A3FF018A2918F8EF00384211 /* apache.txt in Resources */,
A3C55771292D1C0B003907DC /* GoogleService-Info.plist in Resources */,
A35C39542936928200C4359F /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -913,7 +913,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAnding;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -954,7 +954,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAnding;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 1 addition & 1 deletion HappyAnding/HappyAnding/Views/MyPageViews/SettingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct SettingView: View {
*/

// MARK: - 버전 정보
SettingCell(title: "버전정보", version: "1.0.0")
SettingCell(title: "버전정보", version: "1.1.0")


// MARK: - 오픈소스 라이선스
Expand Down
Loading