Compare commits

..

No commits in common. '745f5884abfdd82a8a9bb3ae48d89cd96dc4dc6b' and 'a58541b5bfc6ce42db1f5c55683b28d609a5640f' have entirely different histories.

  1. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 2
      PadelClub/Views/Navigation/Agenda/ActivityView.swift
  3. 10
      PadelClub/Views/Navigation/MainView.swift

@ -3245,7 +3245,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -3293,7 +3293,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6;

@ -113,8 +113,6 @@ struct ActivityView: View {
@Bindable var navigation = navigation
NavigationStack(path: $navigation.path) {
VStack(spacing: 0) {
Color.clear.frame(height: 1)
.background(Material.ultraThinMaterial)
GenericDestinationPickerView(selectedDestination: $navigation.agendaDestination, destinations: AgendaDestination.allCases, nilDestinationIsValid: false)
ScrollViewReader { proxy in

@ -100,8 +100,10 @@ struct MainView: View {
// PadelClubView()
// .tabItem(for: .padelClub)
}
.applyTabViewBottomAccessory(isVisible: (navigation.selectedTab == .activity || navigation.selectedTab == nil) && _shouldDisplaySearchStatus(), content: {
_searchBoxView()
.applyTabViewBottomAccessory(content: {
if (navigation.selectedTab == .activity || navigation.selectedTab == nil) && _shouldDisplaySearchStatus() {
_searchBoxView()
}
})
.sheet(isPresented: $presentFilterView) {
TournamentFilterView(federalDataViewModel: federalDataViewModel)
@ -355,10 +357,10 @@ struct MainView: View {
fileprivate extension View {
@ViewBuilder
func applyTabViewBottomAccessory<Content: View>(isVisible: Bool,
func applyTabViewBottomAccessory<Content: View>(
@ViewBuilder content: () -> Content
) -> some View {
if #available(iOS 26.0, *), isVisible {
if #available(iOS 26.0, *) {
self.tabViewBottomAccessory {
content()
}

Loading…
Cancel
Save