Skip to content

Commit 81f20a5

Browse files
committed
UI changes for clarity on steps setting page. It's ugly but it's clear what to do.
1 parent b545da0 commit 81f20a5

4 files changed

Lines changed: 24 additions & 81 deletions

File tree

InfiniLink/View Components/Sheets/StepsSettingsSheet.swift

Lines changed: 0 additions & 70 deletions
This file was deleted.

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepSettingsDatePicker.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ struct StepSettingsSheetDatePicker: View {
2323

2424
var body: some View {
2525
Text("Manually Add Step Count")
26-
.font(.title)
26+
.font(.title2)
2727
.padding()
2828
DatePicker("Select Date", selection: $selectedDate, displayedComponents: [.date])
2929
.padding()
30-
TextField("Number of Steps", text: $addDateValue.value)
30+
TextField("Enter Number of Steps", text: $addDateValue.value)
31+
.textFieldStyle(.roundedBorder)
3132
.padding()
32-
.keyboardType(.decimalPad)
33+
.keyboardType(.numberPad)
3334
Button {
3435
StepCountPersistenceManager().setStepCount(steps: Int(addDateValue.value)!, arbitrary: true, date: selectedDate)
3536
} label: {

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepSettingsGoalChange.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ struct StepSettingsSheetGoalChange: View {
2323

2424
var body: some View {
2525
Text("Change Step Count Goal")
26-
.font(.title)
26+
.font(.title2)
2727
.padding()
28-
TextField("Step Goal", text: $setStepGoal.value)
28+
TextField("Enter Step Goal", text: $setStepGoal.value)
29+
.textFieldStyle(.roundedBorder)
2930
.padding()
30-
.keyboardType(.decimalPad)
31+
.keyboardType(.numberPad)
3132
Button {
3233
stepCountGoal = Int(setStepGoal.value)!
3334
} label: {

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepsSettingsSheet.swift

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,29 @@
1010
import SwiftUI
1111

1212
struct StepSettingsSheet: View {
13+
@State var pickerState = 0
1314

1415
var body: some View {
1516
VStack (alignment: .leading) {
1617
SheetCloseButton()
17-
Text("Step Count Settings")
18+
Text("Steps Settings")
1819
.font(.largeTitle)
1920
.padding()
2021
.padding(.bottom, 20)
21-
StepSettingsSheetGoalChange()
22-
Divider()
23-
.padding()
24-
StepSettingsSheetDatePicker()
22+
Picker("", selection: $pickerState) {
23+
Text("Step Goal").tag(0)
24+
Text("Add Steps").tag(1)
25+
}.pickerStyle(.segmented)
26+
.padding(.bottom)
27+
.padding(.horizontal)
28+
switch pickerState {
29+
case 0:
30+
StepSettingsSheetGoalChange()
31+
case 1:
32+
StepSettingsSheetDatePicker()
33+
default:
34+
EmptyView()
35+
}
2536
Spacer()
2637
}
2738
}

0 commit comments

Comments
 (0)