diff --git a/Uplift.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Uplift.xcworkspace/xcshareddata/swiftpm/Package.resolved index 433e9cb..7fb3b7d 100644 --- a/Uplift.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Uplift.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "4b9b3950fbe6da2fe6e272e05e7838a9e224fb88becd3ddc341ab9714f0b8c6d", + "originHash" : "cdc8655ffc7ebbb23650b448b043f956af2b54256b14a7272467b60f2aaa9eef", "pins" : [ { "identity" : "abseil-cpp-binary", diff --git a/Uplift/Views/Home/GymDetailView.swift b/Uplift/Views/Home/GymDetailView.swift index fb3c0f8..618b1ee 100644 --- a/Uplift/Views/Home/GymDetailView.swift +++ b/Uplift/Views/Home/GymDetailView.swift @@ -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 { diff --git a/Uplift/Views/Supporting/SlidingTabBarView.swift b/Uplift/Views/Supporting/SlidingTabBarView.swift index dd22769..9999fec 100644 --- a/Uplift/Views/Supporting/SlidingTabBarView.swift +++ b/Uplift/Views/Supporting/SlidingTabBarView.swift @@ -32,8 +32,8 @@ struct SlidingTabBarView: 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 { @@ -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 }