Skip to content

Tab bar styling adjustment #38

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
merged 11 commits into from
Mar 12, 2024
Merged

Tab bar styling adjustment #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d3a6f9
Made fitness center images stretchy headers
caitlynjin Feb 11, 2024
1b57c23
Modified gym images as stretchy headers
caitlynjin Feb 11, 2024
18c2f6e
Merge branch 'caitlyn/issues' of github.com:cuappdev/uplift-ios-swift…
caitlynjin Feb 11, 2024
601f5b6
Adjusted font/color on tab bar and added divider
caitlynjin Feb 26, 2024
5c3822b
Merge branch 'caitlyn/fix-hours' into caitlyn/stretchy-header
caitlynjin Feb 26, 2024
ae2f5f9
Update Package.resolved
caitlynjin Feb 26, 2024
b6fc9c7
Merge branch 'caitlyn/stretchy-header' into caitlyn/tab-design
caitlynjin Feb 26, 2024
060cb13
Addressed Vin's comments
caitlynjin Mar 6, 2024
b2b2072
Update project.pbxproj
caitlynjin Mar 12, 2024
1283313
Merge branch 'main' into caitlyn/tab-design
caitlynjin Mar 12, 2024
48a5504
Update Package.resolved
caitlynjin Mar 12, 2024
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
2 changes: 1 addition & 1 deletion Uplift.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Uplift/Views/Home/GymDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ struct GymDetailView: View {
heroSection
!gym.amenities.isEmpty ? amenitiesSection : nil
slidingTabBar(gymName: viewModel.determineGymNameEnum(gym: gym))
DividerLine()

Group {
if viewModel.selectedTab == .fitnessCenter {
Expand Down
10 changes: 5 additions & 5 deletions Uplift/Views/Supporting/SlidingTabBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ struct SlidingTabBarView<T: Hashable>: View {
private func tab(for item: Item) -> some View {
VStack(alignment: .center, spacing: 16) {
Text(item.title)
.font(selectedTab == item.tab ? config.selectedFont : config.unselectedFont)
.foregroundStyle(config.color)
.font(config.font)
.foregroundStyle(selectedTab == item.tab ? config.selectedFontColor : config.unselectedFontColor)
.padding(.top)

if selectedTab == item.tab {
Expand Down Expand Up @@ -68,10 +68,10 @@ extension SlidingTabBarView {

/// Configuration for a tab bar.
struct TabBarConfig {
var color: Color = Constants.Colors.black
var selectedFont: Font = Constants.Fonts.labelBold
var font: Font = Constants.Fonts.labelBold
var selectedFontColor: Color = Constants.Colors.black
var selectedUnderlineColor: Color = Constants.Colors.yellow
var unselectedFont: Font = Constants.Fonts.labelMedium
var unselectedFontColor: Color = Constants.Colors.gray04
var unselectedUnderlineColor: Color = Constants.Colors.white
}

Expand Down