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

Assignment - Fix Calculator and make NetworkModel #12

Open
wants to merge 2 commits into
base: changgyo
Choose a base branch
from
Open

Assignment - Fix Calculator and make NetworkModel #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07dc4b1
make Network Module and fix Calculator
Dunkkkk Sep 2, 2022
e71f0ec
make networkModuleMoyatype
Dunkkkk Sep 5, 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
24 changes: 12 additions & 12 deletions week4/Calculator/Calculator.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
6F1A922928B13AE8009FBF28 /* CalculatorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F1A922828B13AE8009FBF28 /* CalculatorModel.swift */; };
6F1A922B28B13B04009FBF28 /* CaculatorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F1A922A28B13B04009FBF28 /* CaculatorManager.swift */; };
6F1A922D28B2159B009FBF28 /* ResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F1A922C28B2159B009FBF28 /* ResultView.swift */; };
6F2AB33028B8D9970054B4BB /* NumberPadGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2AB32F28B8D9970054B4BB /* NumberPadGrid.swift */; };
6F2AB33228B8D9A60054B4BB /* NumberPad.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2AB33128B8D9A60054B4BB /* NumberPad.swift */; };
6F2AB33028B8D9970054B4BB /* NumberPad.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2AB32F28B8D9970054B4BB /* NumberPad.swift */; };
6F2AB33228B8D9A60054B4BB /* CalculatorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2AB33128B8D9A60054B4BB /* CalculatorButton.swift */; };
6F2AB33528B8DC930054B4BB /* Ex+Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2AB33428B8DC930054B4BB /* Ex+Color.swift */; };
6F2AB33728B90EB10054B4BB /* Ex+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2AB33628B90EB10054B4BB /* Ex+String.swift */; };
/* End PBXBuildFile section */
Expand All @@ -29,8 +29,8 @@
6F1A922828B13AE8009FBF28 /* CalculatorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorModel.swift; sourceTree = "<group>"; };
6F1A922A28B13B04009FBF28 /* CaculatorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaculatorManager.swift; sourceTree = "<group>"; };
6F1A922C28B2159B009FBF28 /* ResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultView.swift; sourceTree = "<group>"; };
6F2AB32F28B8D9970054B4BB /* NumberPadGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberPadGrid.swift; sourceTree = "<group>"; };
6F2AB33128B8D9A60054B4BB /* NumberPad.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberPad.swift; sourceTree = "<group>"; };
6F2AB32F28B8D9970054B4BB /* NumberPad.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberPad.swift; sourceTree = "<group>"; };
6F2AB33128B8D9A60054B4BB /* CalculatorButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorButton.swift; sourceTree = "<group>"; };
6F2AB33428B8DC930054B4BB /* Ex+Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Ex+Color.swift"; sourceTree = "<group>"; };
6F2AB33628B90EB10054B4BB /* Ex+String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Ex+String.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -113,8 +113,8 @@
isa = PBXGroup;
children = (
6F1A922C28B2159B009FBF28 /* ResultView.swift */,
6F2AB32F28B8D9970054B4BB /* NumberPadGrid.swift */,
6F2AB33128B8D9A60054B4BB /* NumberPad.swift */,
6F2AB32F28B8D9970054B4BB /* NumberPad.swift */,
6F2AB33128B8D9A60054B4BB /* CalculatorButton.swift */,
);
path = SubViews;
sourceTree = "<group>";
Expand Down Expand Up @@ -205,8 +205,8 @@
6F2AB33728B90EB10054B4BB /* Ex+String.swift in Sources */,
6F1A922B28B13B04009FBF28 /* CaculatorManager.swift in Sources */,
6F1A921828B13A71009FBF28 /* CalculatorApp.swift in Sources */,
6F2AB33228B8D9A60054B4BB /* NumberPad.swift in Sources */,
6F2AB33028B8D9970054B4BB /* NumberPadGrid.swift in Sources */,
6F2AB33228B8D9A60054B4BB /* CalculatorButton.swift in Sources */,
6F2AB33028B8D9970054B4BB /* NumberPad.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -335,7 +335,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Calculator/Preview Content\"";
DEVELOPMENT_TEAM = 3FAK98S72C;
DEVELOPMENT_TEAM = VT6KC94KM7;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
Expand All @@ -348,7 +348,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = jum.Calculator;
PRODUCT_BUNDLE_IDENTIFIER = pccommen.Calculator;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand All @@ -364,7 +364,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Calculator/Preview Content\"";
DEVELOPMENT_TEAM = 3FAK98S72C;
DEVELOPMENT_TEAM = VT6KC94KM7;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
Expand All @@ -377,7 +377,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = jum.Calculator;
PRODUCT_BUNDLE_IDENTIFIER = pccommen.Calculator;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion week4/Calculator/Calculator/CalculatorApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct CalculatorApp: App {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

계산기는 공백이나, 오타 등이 수정이 안돼서 천천히 읽어보면서 확인해 주세요.
리뷰는 보류합니다.

함수의 시작부에 공백은 하지말고, 구조체나 클래스, 확장 때에만 쓸지 말지 정해주세요.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

다시 수정하겠습니다

var body: some Scene {
WindowGroup {
ContentView(calculatorManager: caculatorManager)
ContentView().environmentObject(caculatorManager)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

caculatorManager -> ca"l"culatorManager

}
}
}
Loading