Skip to content

COF-32 can't see last coffee #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heyjaywilson merged 3 commits into from
Mar 24, 2022
Merged

COF-32 can't see last coffee #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
512655b
Adds space at the bottom of the scroll view so the last one isn’t cut…
Mar 24, 2022
f8bac23
Most recent at the top
Mar 24, 2022
e1006cc
fix: accent color closes COF-33
Mar 24, 2022
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
5 changes: 5 additions & 0 deletions CoffeeTracker/CoffeeTracker/About/AboutView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ struct AboutView: View {
}.sheet(isPresented: $showFeedback) {
UserFeedbackView()
}

HStack {
Spacer()
.frame(height: 120)
}
}
}
Group {
Expand Down
4 changes: 4 additions & 0 deletions CoffeeTracker/CoffeeTracker/Beans/BeansCollectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ struct BeansCollectionView: View {
.padding(.vertical, 5)
.padding(.horizontal)
}
HStack {
Spacer()
.frame(height: 120)
}
}
Group {
GeometryReader { geometry in
Expand Down
1 change: 1 addition & 0 deletions CoffeeTracker/CoffeeTracker/Beans/BeansCollectionViewOO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,6 @@ extension BeansCollectionViewOO: NSFetchedResultsControllerDelegate {
objectID: foundBean.objectID,
image: image!)
})
beans.sort{$0.boughtOn > $1.boughtOn}
}
}
4 changes: 3 additions & 1 deletion CoffeeTracker/CoffeeTracker/Navigation/TabBarIcon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import SwiftUI

struct TabBarIcon: View {
@Environment(\.colorScheme) private var colorScheme

@StateObject var navRouter: NavigationRouter

let assignedPage: Page
Expand All @@ -25,7 +27,7 @@ struct TabBarIcon: View {
Text(tabName)
.font(.footnote)
Spacer()
}.foregroundColor(assignedPage == navRouter.currentPage ? Color.blue : Color.primary)
}.foregroundColor(colorScheme == .light ? assignedPage == navRouter.currentPage ? Color.indigo : Color.secondary : assignedPage == navRouter.currentPage ? Color.cyan : Color.secondary)
.onTapGesture {
navRouter.currentPage = assignedPage
}
Expand Down