Code refactoring

This commit is contained in:
Ivan Bushchik 2022-01-18 20:29:03 +03:00
parent 5e83583583
commit 11dc8c93cf

View file

@ -35,23 +35,28 @@ struct ContentView: View {
ForEach([String](coof.keys), id: \.self) { ForEach([String](coof.keys), id: \.self) {
subjectSN in Text("\(subjectSN)") subjectSN in Text("\(subjectSN)")
} }
}.pickerStyle(.wheel) }
.pickerStyle(.wheel)
VStack{ VStack{
Picker("Оценка", selection: $selectedGrade){ Picker("Оценка", selection: $selectedGrade){
ForEach(Grade.allCases, id: \.self) { ForEach(Grade.allCases, id: \.self) {
currGrade in Text("\(currGrade.rawValue)") currGrade in Text("\(currGrade.rawValue)")
} }
} }
}.pickerStyle(.segmented).padding(.horizontal, 20) }
}.padding(.top, 100) .pickerStyle(.segmented)
.padding(.horizontal, 20)
}
.padding(.top, 100)
Button ("Добавить оценку"){ Button ("Добавить оценку"){
counter.multiplier = coof[selectedTypeOfGrade]! counter.multiplier = coof[selectedTypeOfGrade]!
counter.gradesWeighted += Double(selectedGrade.rawValue) * counter.multiplier counter.gradesWeighted += Double(selectedGrade.rawValue) * counter.multiplier
counter.weightsSum += counter.multiplier counter.weightsSum += counter.multiplier
self.sr = (counter.gradesWeighted / counter.weightsSum) self.sr = (counter.gradesWeighted / counter.weightsSum)
}.buttonStyle(.borderedProminent) }
Text(String("Средний балл: \(self.sr)")) .buttonStyle(.borderedProminent)
.fontWeight(.bold) Text(String("Средний балл: \(self.sr)"))
.fontWeight(.bold)
Button ("Очистить"){ Button ("Очистить"){
counter.multiplier = 1.5 counter.multiplier = 1.5
counter.gradesWeighted = 0 counter.gradesWeighted = 0
@ -59,9 +64,7 @@ struct ContentView: View {
self.sr = 0 self.sr = 0
}.buttonStyle(.borderedProminent) }.buttonStyle(.borderedProminent)
} }
.padding(.top, -155.0) .padding(.top, -155.0)
} }
} }
struct ContentView_Previews: PreviewProvider { struct ContentView_Previews: PreviewProvider {