Compare commits

..

3 Commits

Author SHA1 Message Date
cheykrym
9ad744f3f1 FAB add post 2025-07-24 23:15:51 +03:00
cheykrym
0cd38f3922 profile 2025-07-24 22:49:42 +03:00
cheykrym
8630910c94 feed fix refresher 2025-07-24 20:05:27 +03:00
7 changed files with 72 additions and 48 deletions

View File

@ -14,6 +14,7 @@ struct RefreshableScrollView<Content: View>: UIViewRepresentable {
func makeUIView(context: Context) -> UIScrollView {
let scrollView = UIScrollView()
scrollView.delaysContentTouches = false
let refreshControl = UIRefreshControl()
refreshControl.addTarget(context.coordinator, action: #selector(Coordinator.handleRefresh), for: .valueChanged)

View File

@ -4,6 +4,7 @@
//
// Created by cheykrym on 09/06/2025.
//
// НЕ ИСПОЛЬЗУЕТСЯ
import SwiftUI

View File

@ -22,7 +22,10 @@ struct HomeTab: View {
}
}
}
.navigationTitle("Лента")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .principal) {}
}
.onAppear {
if posts.isEmpty {
fetchData(isInitialLoad: true)
@ -35,6 +38,8 @@ struct HomeTab: View {
private func fetchData(isInitialLoad: Bool = false) {
if isInitialLoad {
isLoading = true
} else {
isRefreshing = true
}
PostService.shared.fetchAllPosts { fetchedPosts in

View File

@ -43,15 +43,7 @@ struct ProfileContentTabbedGrid: View {
.cornerRadius(8)
.font(.subheadline)
Button {
// Создать пост
} label: {
Label("Создать", systemImage: "plus")
.font(.subheadline)
.padding(8)
.background(Color.blue.opacity(0.2))
.cornerRadius(8)
}
} else {
TextField("Поиск", text: $searchQuery)
.padding(.horizontal, 10)

View File

@ -22,13 +22,20 @@ struct ProfileTab: View {
@State private var selectedPostData: (Post, [Post])?
@State private var isShowingFollowers = false
@State private var isShowingFollowing = false
var body: some View {
NavigationView {
if !isContentLoaded {
SplashScreenView()
} else {
ZStack(alignment: .bottomTrailing) {
VStack(spacing: 0) {
// Скрытый NavigationLink для программного перехода
// Скрытые NavigationLink для программного перехода
NavigationLink(destination: FollowersView(followers: followers), isActive: $isShowingFollowers) { EmptyView() }
NavigationLink(destination: FollowingView(following: following), isActive: $isShowingFollowing) { EmptyView() }
if let (post, posts) = selectedPostData {
NavigationLink(
destination: PostFeedView(posts: posts, selectedPostID: post.id),
@ -43,9 +50,9 @@ struct ProfileTab: View {
RefreshableScrollView(isRefreshing: $isRefreshing, onRefresh: {
fetchData()
}) {
VStack(spacing: 0) {
VStack(spacing: 12) {
header
.frame(minHeight: 300)
// .frame(minHeight: 300)
.frame(maxWidth: .infinity)
.background(Color(.systemBackground))
@ -60,12 +67,27 @@ struct ProfileTab: View {
}
}
}
// FAB
Button(action: {
// TODO: Действие для создания поста
}) {
Image(systemName: "plus")
.font(.system(size: 24, weight: .bold))
.foregroundColor(.white)
.padding()
.background(Color.blue)
.clipShape(Circle())
.shadow(radius: 5)
}
.padding()
}
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .principal) {
Button(action: { sheetType = .accountShare }) {
HStack(spacing: 4) {
Text("custom_user_name")
Text(selectedAccount)
.font(.headline)
.foregroundColor(.primary)
Image(systemName: "chevron.down")
@ -131,7 +153,7 @@ struct ProfileTab: View {
.frame(width: 72, height: 72)
.foregroundColor(.gray)
Text(selectedAccount)
Text("custom_user_name")
.font(.headline)
}
.padding(.top, 16)
@ -145,10 +167,10 @@ struct ProfileTab: View {
// Статистика
HStack(spacing: 32) {
statView("24", "Посты")
NavigationLink(destination: FollowersView(followers: followers)) {
Button(action: { isShowingFollowers = true }) {
statView("1.2k", "Подписчики")
}
NavigationLink(destination: FollowingView(following: following)) {
Button(action: { isShowingFollowing = true }) {
statView("156", "Подписки")
}
}
@ -164,5 +186,6 @@ struct ProfileTab: View {
Text(label)
.font(.caption)
}
.foregroundColor(.primary)
}
}

View File

@ -1,3 +1,5 @@
// НЕ ИСПОЛЬЗУЕТСЯ
import SwiftUI
struct PublicsTab: View {

View File

@ -250,13 +250,14 @@
1AEE5EA92E21A4FC00A3DCA3 /* Tab */ = {
isa = PBXGroup;
children = (
1AEE5ECC2E21C9D100A3DCA3 /* Profile */,
1A7940C52DF7A98E002569DA /* ContactsTab.swift */,
1A7940C92DF7A99B002569DA /* ChatsTab.swift */,
1A7940B52DF77F21002569DA /* MainView.swift */,
1AEE5EAA2E21A83200A3DCA3 /* HomeTab.swift */,
1AEE5EAE2E21A84500A3DCA3 /* PublicsTab.swift */,
1AEE5EB22E21A85800A3DCA3 /* SearchTab.swift */,
1A7940C92DF7A99B002569DA /* ChatsTab.swift */,
1A7940CD2DF7A9AA002569DA /* ProfileTab.swift */,
1AEE5ECC2E21C9D100A3DCA3 /* Profile */,
1A7940C52DF7A98E002569DA /* ContactsTab.swift */,
1AEE5EAE2E21A84500A3DCA3 /* PublicsTab.swift */,
);
path = Tab;
sourceTree = "<group>";
@ -266,7 +267,6 @@
children = (
1AD757CC2E27608C0069C1FD /* PostFeedView.swift */,
1ACE60FF2E22F54700B37AC5 /* Settings */,
1A7940CD2DF7A9AA002569DA /* ProfileTab.swift */,
1AB4F8CC2E22E341002B6E40 /* AccountShareSheet.swift */,
1AE587242E23337000254F06 /* ProfileContentGrid.swift */,
1ACE61202E22FFD000B37AC5 /* ProfileContentTabbedGrid.swift */,