Skip to content

Commit

Permalink
Merge pull request #327 from TeamNADA/develop
Browse files Browse the repository at this point in the history
[CHORE] #326 - develop -> main 머지하기 (1.0.2 릴리즈 완료)
  • Loading branch information
dlwns33 authored Apr 12, 2022
2 parents 2dae719 + 41e3286 commit 46f8340
Show file tree
Hide file tree
Showing 69 changed files with 356 additions and 482 deletions.
1 change: 0 additions & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ disabled_rules:
- function_parameter_count
- function_body_length
- cyclomatic_complexity
- file_length
excluded:
- Pods
- NADA-iOS-forRelease/Sources/AppDelegate.swift
Expand Down
40 changes: 14 additions & 26 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
3903CC212769F4F40094C458 /* EmptyCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3903CC1F2769F4F40094C458 /* EmptyCardCell.xib */; };
390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 390515B72706CEBB00C5F7A5 /* Colors.xcassets */; };
3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3909242E26FA15E800236C51 /* UIView+Extension.swift */; };
3918F66727719C4B00984648 /* UserTokenReissueRequset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3918F66627719C4B00984648 /* UserTokenReissueRequset.swift */; };
3918F66727719C4B00984648 /* UserReissueToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3918F66627719C4B00984648 /* UserReissueToken.swift */; };
3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */; };
392BAF792793BAF80013DCB3 /* KeyChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392BAF782793BAF80013DCB3 /* KeyChain.swift */; };
392BAF7B2793E90D0013DCB3 /* KeyChainKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392BAF7A2793E90D0013DCB3 /* KeyChainKey.swift */; };
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */; };
392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */; };
39317D2227646F8E00D87166 /* GroupNameEditBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39317D2127646F8E00D87166 /* GroupNameEditBottomSheetViewController.swift */; };
Expand All @@ -35,7 +37,6 @@
39523E0B270184B100536900 /* CardList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39523E0A270184B100536900 /* CardList.storyboard */; };
39523E5B2701A48900536900 /* CardListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39523E592701A48900536900 /* CardListTableViewCell.swift */; };
39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39523E5A2701A48900536900 /* CardListTableViewCell.xib */; };
39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39523E5E2701AA9000536900 /* CardListDataModel.swift */; };
3958F239270FFBBF00B100B2 /* GroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3958F238270FFBBF00B100B2 /* GroupViewController.swift */; };
3958F23C270FFBD500B100B2 /* Group.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3958F23B270FFBD500B100B2 /* Group.storyboard */; };
3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3979709526FA0BE5003FB4F5 /* LoginViewController.swift */; };
Expand Down Expand Up @@ -156,8 +157,10 @@
390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
3918F6652771682F00984648 /* NADA-iOS-forRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NADA-iOS-forRelease.entitlements"; sourceTree = "<group>"; };
3918F66627719C4B00984648 /* UserTokenReissueRequset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserTokenReissueRequset.swift; sourceTree = "<group>"; };
3918F66627719C4B00984648 /* UserReissueToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserReissueToken.swift; sourceTree = "<group>"; };
3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults.swift; sourceTree = "<group>"; };
392BAF782793BAF80013DCB3 /* KeyChain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyChain.swift; sourceTree = "<group>"; };
392BAF7A2793E90D0013DCB3 /* KeyChainKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyChainKey.swift; sourceTree = "<group>"; };
392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreListTableViewCell.swift; sourceTree = "<group>"; };
392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreListTableViewCell.xib; sourceTree = "<group>"; };
39317D2127646F8E00D87166 /* GroupNameEditBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupNameEditBottomSheetViewController.swift; sourceTree = "<group>"; };
Expand All @@ -179,7 +182,6 @@
39523E0A270184B100536900 /* CardList.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardList.storyboard; sourceTree = "<group>"; };
39523E592701A48900536900 /* CardListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListTableViewCell.swift; sourceTree = "<group>"; };
39523E5A2701A48900536900 /* CardListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardListTableViewCell.xib; sourceTree = "<group>"; };
39523E5E2701AA9000536900 /* CardListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListDataModel.swift; sourceTree = "<group>"; };
3958F238270FFBBF00B100B2 /* GroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupViewController.swift; sourceTree = "<group>"; };
3958F23B270FFBD500B100B2 /* Group.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Group.storyboard; sourceTree = "<group>"; };
3979709526FA0BE5003FB4F5 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -396,14 +398,6 @@
path = CardList;
sourceTree = "<group>";
};
39523E5D2701AA5700536900 /* CardList */ = {
isa = PBXGroup;
children = (
39523E5E2701AA9000536900 /* CardListDataModel.swift */,
);
path = CardList;
sourceTree = "<group>";
};
3958F237270FFB8700B100B2 /* Group */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -477,7 +471,7 @@
children = (
39D13564273FDB9C00B1A148 /* User.swift */,
39D13567273FDCB800B1A148 /* UserWithTokenRequest.swift */,
3918F66627719C4B00984648 /* UserTokenReissueRequset.swift */,
3918F66627719C4B00984648 /* UserReissueToken.swift */,
);
path = User;
sourceTree = "<group>";
Expand Down Expand Up @@ -764,6 +758,7 @@
children = (
F8C83FBA272F9F370009DF0D /* NetworkResult.swift */,
F8C83FBC272F9F430009DF0D /* GenericResponse.swift */,
392BAF782793BAF80013DCB3 /* KeyChain.swift */,
3981148A273BEB7200E28630 /* User */,
F87122722733032300A24E74 /* Card */,
777FF89927359B1000BF69D3 /* Group */,
Expand Down Expand Up @@ -821,7 +816,6 @@
F8FC438726C01CDD0033E151 /* SceneDelegate.swift */,
F8FC439B26C01EC30033E151 /* Cells */,
F8FC439C26C01EC90033E151 /* Classes */,
F8FC439D26C01EEC0033E151 /* AppModel */,
F8C83FB9272F9F030009DF0D /* NetworkModel */,
F8FC439E26C01EF70033E151 /* NetworkService */,
F8FC439F26C01EFC0033E151 /* Protocols */,
Expand Down Expand Up @@ -854,14 +848,6 @@
path = Classes;
sourceTree = "<group>";
};
F8FC439D26C01EEC0033E151 /* AppModel */ = {
isa = PBXGroup;
children = (
39523E5D2701AA5700536900 /* CardList */,
);
path = AppModel;
sourceTree = "<group>";
};
F8FC439E26C01EF70033E151 /* NetworkService */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -941,6 +927,7 @@
3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */,
77F47D92276C79B600414659 /* Header.swift */,
770E58852778A78900498C2E /* Status.swift */,
392BAF7A2793E90D0013DCB3 /* KeyChainKey.swift */,
);
path = Constants;
sourceTree = "<group>";
Expand Down Expand Up @@ -1166,6 +1153,7 @@
F8268DB927730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift in Sources */,
770E58862778A78900498C2E /* Status.swift in Sources */,
F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */,
392BAF7B2793E90D0013DCB3 /* KeyChainKey.swift in Sources */,
39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */,
F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */,
F8FC43B826C0227D0033E151 /* Const.swift in Sources */,
Expand All @@ -1192,15 +1180,15 @@
3981148E273BEBB300E28630 /* CardListEditRequest.swift in Sources */,
39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */,
7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */,
3918F66727719C4B00984648 /* UserTokenReissueRequset.swift in Sources */,
3918F66727719C4B00984648 /* UserReissueToken.swift in Sources */,
7705CF3E2752C7DB005195DF /* CardView.swift in Sources */,
F8FC43BA26C022900033E151 /* ViewController.swift in Sources */,
39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */,
39D13568273FDCB800B1A148 /* UserWithTokenRequest.swift in Sources */,
F84BAFB126FDB552004CA335 /* BackCardCreationCollectionViewCell.swift in Sources */,
39811490273BEBCE00E28630 /* CardListRequest.swift in Sources */,
F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */,
F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */,
392BAF792793BAF80013DCB3 /* KeyChain.swift in Sources */,
7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */,
3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */,
7734D5B82777A8E8004360E4 /* String+Extension.swift in Sources */,
Expand Down Expand Up @@ -1376,7 +1364,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = "YJC.NADA-iOS-forRelease";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -1399,7 +1387,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = "YJC.NADA-iOS-forRelease";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 46f8340

Please sign in to comment.