diff --git a/ios/Platform/Platform/ContentView.swift b/ios/Platform/Platform/ContentView.swift index 35db154..c4178a7 100644 --- a/ios/Platform/Platform/ContentView.swift +++ b/ios/Platform/Platform/ContentView.swift @@ -53,29 +53,29 @@ struct MainTabView: View { .tint(Color.accentWarm) .modifier(TabBarMinimizeModifier()) - // Floating buttons - VStack { - Spacer() - HStack(alignment: .bottom) { - // Feedback button (subtle, bottom-left) - FeedbackButton() - .padding(.leading, 20) - + // Floating buttons (hidden on Reader tab) + if selectedTab != 2 { + VStack { Spacer() + HStack(alignment: .bottom) { + FeedbackButton() + .padding(.leading, 20) - // Add food button (prominent, bottom-right) - Button { showAssistant = true } label: { - Image(systemName: "plus") - .font(.title2.weight(.semibold)) - .foregroundStyle(.white) - .frame(width: 56, height: 56) - .background(Color.accentWarm) - .clipShape(Circle()) - .shadow(color: .black.opacity(0.2), radius: 8, y: 4) + Spacer() + + Button { showAssistant = true } label: { + Image(systemName: "plus") + .font(.title2.weight(.semibold)) + .foregroundStyle(.white) + .frame(width: 56, height: 56) + .background(Color.accentWarm) + .clipShape(Circle()) + .shadow(color: .black.opacity(0.2), radius: 8, y: 4) + } + .padding(.trailing, 20) } - .padding(.trailing, 20) + .padding(.bottom, 70) } - .padding(.bottom, 70) } } .confettiCannon( diff --git a/ios/Platform/Platform/Features/Reader/Views/ReaderTabView.swift b/ios/Platform/Platform/Features/Reader/Views/ReaderTabView.swift index 9cb7ec1..753d46d 100644 --- a/ios/Platform/Platform/Features/Reader/Views/ReaderTabView.swift +++ b/ios/Platform/Platform/Features/Reader/Views/ReaderTabView.swift @@ -11,7 +11,7 @@ struct ReaderTabView: View { var body: some View { NavigationStack { - ZStack(alignment: .bottom) { + ZStack(alignment: .bottomTrailing) { VStack(spacing: 0) { // Sub-tab selector HStack(spacing: 0) { @@ -93,7 +93,8 @@ struct ReaderTabView: View { // MARK: - Liquid Glass Control Bar glassControlBar - .padding(.bottom, 2) + .padding(.trailing, 16) + .padding(.bottom, 4) } .navigationBarHidden(true) .sheet(isPresented: $showFeedSheet) { diff --git a/ios/Platform/Platform/Features/Reader/Views/ScrollViewDriver.swift b/ios/Platform/Platform/Features/Reader/Views/ScrollViewDriver.swift index 96eec31..8c154cf 100644 --- a/ios/Platform/Platform/Features/Reader/Views/ScrollViewDriver.swift +++ b/ios/Platform/Platform/Features/Reader/Views/ScrollViewDriver.swift @@ -110,6 +110,9 @@ struct ScrollViewDriver: UIViewRepresentable { sv.contentOffset.y = newY + // Notify delegate so tab bar minimize behavior triggers + originalDelegate?.scrollViewDidScroll?(sv) + // Stop at bottom if newY >= maxOffset - 1 { stopAndNotify()