Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 8 additions & 14 deletions Stanford360/Activity/View/ActivityAddView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,15 @@
Text.goalMessage(current: Double(activityManager.getTodayTotalMinutes()), goal: 60, unit: "min")
.padding(.top, 10)

Spacer()

VStack {
// Activity input components
ActivityPickerView(selectedActivity: $selectedActivity)
.padding()

HStack {
saveNewActivityButton(showingAddActivity: $showingAddActivity)

ActivityRecallButton()
.offset(x: -10)
}
// Activity input components
ActivityPickerView(selectedActivity: $selectedActivity)
.padding(.top, 20)

HStack {
saveNewActivityButton(showingAddActivity: $showingAddActivity)

ActivityRecallButton()

Check warning on line 50 in Stanford360/Activity/View/ActivityAddView.swift

View check run for this annotation

Codecov / codecov/patch

Stanford360/Activity/View/ActivityAddView.swift#L43-L50

Added lines #L43 - L50 were not covered by tests
}
.padding(.bottom, 30)
}
.padding(.horizontal)

Expand Down
19 changes: 7 additions & 12 deletions Stanford360/Activity/View/ActivityTabView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,15 @@
var body: some View {
VStack {
TrackerSegmentedPicker(selectedTrackerSection: $selectedTrackerSection)

Group {
switch selectedTrackerSection {
case .add:
ActivityAddView()
case .history:
ActivityHistoryView()
case .discover:
ActivityDiscoverView()
}

TabView(selection: $selectedTrackerSection) {
ActivityAddView().tag(TrackerSection.add)
ActivityHistoryView().tag(TrackerSection.history)
ActivityDiscoverView().tag(TrackerSection.discover)

Check warning on line 24 in Stanford360/Activity/View/ActivityTabView.swift

View check run for this annotation

Codecov / codecov/patch

Stanford360/Activity/View/ActivityTabView.swift#L20-L24

Added lines #L20 - L24 were not covered by tests
}
.tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))

Check warning on line 26 in Stanford360/Activity/View/ActivityTabView.swift

View check run for this annotation

Codecov / codecov/patch

Stanford360/Activity/View/ActivityTabView.swift#L26

Added line #L26 was not covered by tests
}
.frame(maxHeight: .infinity, alignment: .top)
}
}

Check warning on line 28 in Stanford360/Activity/View/ActivityTabView.swift

View check run for this annotation

Codecov / codecov/patch

Stanford360/Activity/View/ActivityTabView.swift#L28

Added line #L28 was not covered by tests
}

#Preview {
Expand Down
Loading