ivabus/GradeMapper
1
0
Fork 0
mirror of https://github.com/ivabus/GradeMapper synced 2024-11-22 08:05:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code refactoring

Browse source
This commit is contained in:
Ivan Bushchik 2022-01-18 20:29:03 +03:00
parent 5e83583583
commit 11dc8c93cf
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Shared/ContentView.swift
View file

@ -35,21 +35,26 @@ 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) }
.buttonStyle(.borderedProminent)
Text(String("Средний балл: \(self.sr)")) Text(String("Средний балл: \(self.sr)"))
.fontWeight(.bold) .fontWeight(.bold)
Button ("Очистить"){ Button ("Очистить"){
@ -60,8 +65,6 @@ struct ContentView: View {
}.buttonStyle(.borderedProminent) }.buttonStyle(.borderedProminent)
} }
.padding(.top, -155.0) .padding(.top, -155.0)
} }
} }
struct ContentView_Previews: PreviewProvider { struct ContentView_Previews: PreviewProvider {