Skip to content

Commit

Permalink
Pull 20210803_2 from boifromangye/main
Browse files Browse the repository at this point in the history
  • Loading branch information
@boifromangye
boifromangye authored Aug 3, 2021
2 parents f627685 + 056a42b commit 6f3916c
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 20 deletions.
4 changes: 4 additions & 0 deletions taewoo_swift_HaneulBori/taewoo_swift_HaneulBori.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
39FDAD3426B7BBF800E99370 /* Admin_ManageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FDAD3326B7BBF800E99370 /* Admin_ManageView.swift */; };
39FDAD3826B7DDAF00E99370 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39FDAD3726B7DDAF00E99370 /* Launch Screen.storyboard */; };
39FDAD3E26B8B5AE00E99370 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FDAD3D26B8B5AE00E99370 /* User.swift */; };
39FDAD4126B8C93F00E99370 /* WashingMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FDAD4026B8C93F00E99370 /* WashingMachine.swift */; };
DAF52866E5BDB3CF2081A7BF /* Pods_taewoo_swift_HaneulBoriTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E6F1C586583AE3297D1815B /* Pods_taewoo_swift_HaneulBoriTests.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -67,6 +68,7 @@
39FDAD3326B7BBF800E99370 /* Admin_ManageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Admin_ManageView.swift; sourceTree = "<group>"; };
39FDAD3726B7DDAF00E99370 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
39FDAD3D26B8B5AE00E99370 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
39FDAD4026B8C93F00E99370 /* WashingMachine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WashingMachine.swift; sourceTree = "<group>"; };
4815C7C2D88B576D4863F8CB /* Pods_taewoo_swift_HaneulBori.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_taewoo_swift_HaneulBori.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5FEA0A7823AE32301FCDA742 /* Pods-taewoo_swift_HaneulBori-taewoo_swift_HaneulBoriUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-taewoo_swift_HaneulBori-taewoo_swift_HaneulBoriUITests.release.xcconfig"; path = "Target Support Files/Pods-taewoo_swift_HaneulBori-taewoo_swift_HaneulBoriUITests/Pods-taewoo_swift_HaneulBori-taewoo_swift_HaneulBoriUITests.release.xcconfig"; sourceTree = "<group>"; };
63D75C7A39C404DD6400F705 /* Pods-taewoo_swift_HaneulBori.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-taewoo_swift_HaneulBori.release.xcconfig"; path = "Target Support Files/Pods-taewoo_swift_HaneulBori/Pods-taewoo_swift_HaneulBori.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -170,6 +172,7 @@
isa = PBXGroup;
children = (
39FDAD3D26B8B5AE00E99370 /* User.swift */,
39FDAD4026B8C93F00E99370 /* WashingMachine.swift */,
);
path = Model;
sourceTree = "<group>";
Expand Down Expand Up @@ -467,6 +470,7 @@
39E769D026A5289600A836A8 /* ContentView.swift in Sources */,
39E769CE26A5289600A836A8 /* taewoo_swift_HaneulBoriApp.swift in Sources */,
39C8C73426A8053000782217 /* UserView.swift in Sources */,
39FDAD4126B8C93F00E99370 /* WashingMachine.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file modified ...t_HaneulBori.xcworkspace/xcuserdata/kwontaewoo.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
9 changes: 9 additions & 0 deletions taewoo_swift_HaneulBori/taewoo_swift_HaneulBori/Model/WashingMachine.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//
// WashingMachine.swift
// taewoo_swift_HaneulBori
//
// Created by 권태우 on 2021/08/03.
//

import Foundation

4 changes: 2 additions & 2 deletions taewoo_swift_HaneulBori/taewoo_swift_HaneulBori/Views/AdminView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ struct AdminView: View {
VStack {
VStack { // Washer No.1
Text("1번 세탁기")
Text("(세탁기 상태)")
Text("\(viewModel.state1)")
}
.foregroundColor(.green)
.multilineTextAlignment(.center)
.padding()
.border(Color.black)
VStack { // Washer No.2
Text("2번 세탁기")
Text("(세탁기 상태)")
Text("\(viewModel.state2)")
}
.foregroundColor(.blue)
.multilineTextAlignment(.center)
Expand Down
65 changes: 47 additions & 18 deletions taewoo_swift_HaneulBori/taewoo_swift_HaneulBori/Views/Admin_ManageView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,76 @@
import SwiftUI

struct Admin_ManageView: View {
@State var isFixed = false
@State var state1 = false
@State var isFixed1 = false
@State var isFixed2 = false
@EnvironmentObject var viewModel: AppViewModel


var body: some View {
VStack {
VStack {
VStack { // Washer No.1
Text("1번 세탁기")
Text("(세탁기 상태)")
Text("\(viewModel.state1)")
}
.foregroundColor(.green)
.multilineTextAlignment(.center)
.padding()
.border(Color.black)
VStack { // Washer No.2
Text("2번 세탁기")
Text("(세탁기 상태)")
Text("\(viewModel.state2)")
}
.foregroundColor(.blue)
.multilineTextAlignment(.center)
.padding()
.border(Color.black)
}.padding()
Spacer()
Button(action: {isFixed.toggle()}) {
if isFixed{
Text("이상 없음")
.padding()
.frame(width: 300)
.border(Color.black)
Button(action: {
isFixed1.toggle()
viewModel.state1 = "미사용"
}) {
HStack{
if isFixed1 {
Text("1번 세탁기 이상 없음")
.padding()
.frame(width: 300)
.border(Color.black)
}
else {
Text("1번 세탁기 수리 필요")
.foregroundColor(Color.black)
.padding()
.frame(width: 300)
.border(Color.black)
.background(Color.red)
}
}
else{
Text("수리 필요")
.foregroundColor(Color.black)
.padding()
.frame(width: 300)
.border(Color.black)
.background(Color.red)
}
.disabled(isFixed1)
Button(action: {
isFixed2.toggle()
viewModel.state2 = "미사용"
}) {
HStack{
if isFixed2 {
Text("2번 세탁기 이상 없음")
.padding()
.frame(width: 300)
.border(Color.black)
}
else {
Text("2번 세탁기 수리 필요")
.foregroundColor(Color.black)
.padding()
.frame(width: 300)
.border(Color.black)
.background(Color.red)
}
}
}
.disabled(isFixed)
.disabled(isFixed2)
Spacer()
}
}
Expand Down

0 comments on commit 6f3916c

Please sign in to comment.