yobble/ios_app_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yobble:40a5f4c628b908496207ed6bf98494127967f55c
Branches Tags
yobble:main
yobble:test-view-open-chat
..
compare: yobble:3ae7576c2411ed17cbd40e060688f7a3bcd9e35c
Branches Tags
yobble:main
yobble:test-view-open-chat

No commits in common. "40a5f4c628b908496207ed6bf98494127967f55c" and "3ae7576c2411ed17cbd40e060688f7a3bcd9e35c" have entirely different histories.
40a5f4c628 ... 3ae7576c24

5 changed files with 57 additions and 139 deletions
Show Stats Expand all files Collapse all files

24
yobble/Components/TopBarView.swift
View File

@ -3,7 +3,6 @@ import SwiftUI
struct TopBarView: View {
var title: String
let isMessengerModeEnabled: Bool
// Состояния для ProfileTab
@Binding var selectedAccount: String
// @Binding var sheetType: ProfileTab.SheetType?
@ -42,19 +41,17 @@ struct TopBarView: View {
var body: some View {
VStack(spacing: 0) {
HStack {
if !isMessengerModeEnabled{
// Кнопка "Гамбургер" для открытия меню
Button(action: {
withAnimation {
isSideMenuPresented.toggle()
}
}) {
Image(systemName: "line.horizontal.3")
.imageScale(.large)
.foregroundColor(.primary)
// Кнопка "Гамбургер" для открытия меню
Button(action: {
withAnimation {
isSideMenuPresented.toggle()
}
}) {
Image(systemName: "line.horizontal.3")
.imageScale(.large)
.foregroundColor(.primary)
}
// Spacer()
if let statusMessage {
@ -224,14 +221,13 @@ struct TopBarView_Previews: PreviewProvider {
var body: some View {
TopBarView(
title: "Chats",
isMessengerModeEnabled: false,
selectedAccount: $selectedAccount,
accounts: [selectedAccount],
viewModel: viewModel,
isSettingsPresented: $isSettingsPresented,
isSideMenuPresented: $isSideMenuPresented,
chatSearchRevealProgress: $revealProgress,
chatSearchText: $searchText,
chatSearchText: $searchText
)
}
}

23
yobble/Views/Login/LoginView.swift
View File

@ -12,7 +12,6 @@ struct LoginView: View {
@EnvironmentObject private var themeManager: ThemeManager
@Environment(\.colorScheme) private var colorScheme
private let themeOptions = ThemeOption.ordered
@AppStorage("messengerModeEnabled") private var isMessengerModeEnabled: Bool = false
@State private var isShowingRegistration = false
@State private var showLegacySupportNotice = false
@ -35,8 +34,7 @@ struct LoginView: View {
}
private var isLoginButtonEnabled: Bool {
// !viewModel.isLoading && isUsernameValid && isPasswordValid && viewModel.hasAcceptedTerms
!viewModel.isLoading && isUsernameValid && isPasswordValid
!viewModel.isLoading && isUsernameValid && isPasswordValid && viewModel.hasAcceptedTerms
}
var body: some View {
@ -115,17 +113,14 @@ struct LoginView: View {
.font(.caption)
}
// TermsAgreementCard(
// isAccepted: $viewModel.hasAcceptedTerms,
// openTerms: {
// viewModel.loadTermsIfNeeded()
// isShowingTerms = true
// }
// )
// .padding(.vertical, 12)
Toggle(NSLocalizedString("Режим мессенжера", comment: ""), isOn: $isMessengerModeEnabled)
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
TermsAgreementCard(
isAccepted: $viewModel.hasAcceptedTerms,
openTerms: {
viewModel.loadTermsIfNeeded()
isShowingTerms = true
}
)
.padding(.vertical, 12)
Button(action: {
viewModel.login()

24
yobble/Views/Tab/ContactsTab.swift
View File

@ -1,24 +0,0 @@
//
// ContactsTab.swift
// yobble
//
// Created by cheykrym on 23.10.2025.
//
import SwiftUI
struct ContactsTab: View {
var body: some View {
VStack {
VStack {
Text("Здесь не будут чаты")
.font(.title)
.foregroundColor(.gray)
Spacer()
}
}
// .background(Color(.secondarySystemBackground)) // Фон для всей вкладки
}
}

49
yobble/Views/Tab/CustomTabBar.swift
View File

@ -2,44 +2,33 @@ import SwiftUI
struct CustomTabBar: View {
@Binding var selectedTab: Int
let isMessengerModeEnabled: Bool
var onCreate: () -> Void
var body: some View {
HStack {
if isMessengerModeEnabled {
// Tab 1: Feed
TabBarButton(systemName: "list.bullet.rectangle", text: NSLocalizedString("Лента", comment: ""), isSelected: selectedTab == 0) {
selectedTab = 0
}
TabBarButton(systemName: "person.2.fill", text: NSLocalizedString("Контакты", comment: ""), isSelected: selectedTab == 4) {
selectedTab = 4
}
TabBarButton(systemName: "bubble.left.and.bubble.right.fill", text: NSLocalizedString("Чаты", comment: ""), isSelected: selectedTab == 2) {
selectedTab = 2
}
// Tab 2: Search
TabBarButton(systemName: "gamecontroller.fill", text: NSLocalizedString("Концепт", comment: "Tab bar: concept clicker"), isSelected: selectedTab == 1) {
selectedTab = 1
}
TabBarButton(systemName: "gearshape.fill", text: NSLocalizedString("Настройки", comment: ""), isSelected: selectedTab == 5) {
selectedTab = 5
}
} else {
TabBarButton(systemName: "list.bullet.rectangle", text: NSLocalizedString("Лента", comment: ""), isSelected: selectedTab == 0) {
selectedTab = 0
}
// Create Button
CreateButton {
onCreate()
}
TabBarButton(systemName: "gamecontroller.fill", text: NSLocalizedString("Концепт", comment: "Tab bar: concept clicker"), isSelected: selectedTab == 1) {
selectedTab = 1
}
// Tab 3: Chats
TabBarButton(systemName: "bubble.left.and.bubble.right.fill", text: NSLocalizedString("Чаты", comment: ""), isSelected: selectedTab == 2) {
selectedTab = 2
}
CreateButton {
onCreate()
}
TabBarButton(systemName: "bubble.left.and.bubble.right.fill", text: NSLocalizedString("Чаты", comment: ""), isSelected: selectedTab == 2) {
selectedTab = 2
}
TabBarButton(systemName: "person.crop.square", text: NSLocalizedString("Лицо", comment: ""), isSelected: selectedTab == 3) {
selectedTab = 3
}
// Tab 4: Profile
TabBarButton(systemName: "person.crop.square", text: NSLocalizedString("Лицо", comment: ""), isSelected: selectedTab == 3) {
selectedTab = 3
}
}
.padding(.horizontal)

76
yobble/Views/Tab/MainView.swift
View File

@ -4,7 +4,6 @@ struct MainView: View {
@ObservedObject var viewModel: LoginViewModel
@EnvironmentObject private var messageCenter: IncomingMessageCenter
@State private var selectedTab: Int = 0
@AppStorage("messengerModeEnabled") private var isMessengerModeEnabled: Bool = false
// @StateObject private var newHomeTabViewModel = NewHomeTabViewModel()
// Состояния для TopBarView
@ -27,8 +26,6 @@ struct MainView: View {
case 1: return "Concept"
case 2: return "Chats"
case 3: return "Profile"
case 4: return "Contacts"
case 5: return "Settings"
default: return "Home"
}
}
@ -45,7 +42,6 @@ struct MainView: View {
VStack(spacing: 0) {
TopBarView(
title: tabTitle,
isMessengerModeEnabled: isMessengerModeEnabled,
selectedAccount: $selectedAccount,
accounts: accounts,
viewModel: viewModel,
@ -56,42 +52,26 @@ struct MainView: View {
)
ZStack {
if isMessengerModeEnabled {
ChatsTab(
loginViewModel: viewModel,
searchRevealProgress: $chatSearchRevealProgress,
searchText: $chatSearchText
)
NewHomeTab()
.opacity(selectedTab == 0 ? 1 : 0)
ConceptTab()
.opacity(selectedTab == 1 ? 1 : 0)
ChatsTab(
loginViewModel: viewModel,
searchRevealProgress: $chatSearchRevealProgress,
searchText: $chatSearchText
)
.opacity(selectedTab == 2 ? 1 : 0)
.allowsHitTesting(selectedTab == 2)
ContactsTab()
.opacity(selectedTab == 4 ? 1 : 0)
SettingsView(viewModel: viewModel)
.opacity(selectedTab == 5 ? 1 : 0)
} else {
NewHomeTab()
.opacity(selectedTab == 0 ? 1 : 0)
ConceptTab()
.opacity(selectedTab == 1 ? 1 : 0)
ChatsTab(
loginViewModel: viewModel,
searchRevealProgress: $chatSearchRevealProgress,
searchText: $chatSearchText
)
.opacity(selectedTab == 2 ? 1 : 0)
.allowsHitTesting(selectedTab == 2)
ProfileTab()
.opacity(selectedTab == 3 ? 1 : 0)
}
ProfileTab()
.opacity(selectedTab == 3 ? 1 : 0)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
CustomTabBar(selectedTab: $selectedTab, isMessengerModeEnabled: isMessengerModeEnabled) {
CustomTabBar(selectedTab: $selectedTab) {
print("Create button tapped")
}
}
@ -114,12 +94,10 @@ struct MainView: View {
.allowsHitTesting(menuOffset > 0)
// Боковое меню
if !isMessengerModeEnabled {
SideMenuView(viewModel: viewModel, isPresented: $isSideMenuPresented)
.frame(width: menuWidth)
.offset(x: -menuWidth + menuOffset) // Новая логика смещения
.ignoresSafeArea(edges: .vertical)
}
SideMenuView(viewModel: viewModel, isPresented: $isSideMenuPresented)
.frame(width: menuWidth)
.offset(x: -menuWidth + menuOffset) // Новая логика смещения
.ignoresSafeArea(edges: .vertical)
}
deepLinkNavigationLink
@ -164,12 +142,6 @@ struct MainView: View {
menuOffset = presented ? menuWidth : 0
}
}
.onAppear {
enforceTabSelectionForMessengerMode()
}
.onChange(of: isMessengerModeEnabled) { _ in
enforceTabSelectionForMessengerMode()
}
.onChange(of: messageCenter.pendingNavigation?.id) { _ in
guard !AppConfig.PRESENT_CHAT_AS_SHEET,
let target = messageCenter.pendingNavigation else { return }
@ -201,16 +173,6 @@ struct MainView: View {
}
private extension MainView {
func enforceTabSelectionForMessengerMode() {
if isMessengerModeEnabled {
if selectedTab < 2 {
selectedTab = 2
}
} else if selectedTab > 3 {
selectedTab = 0
}
}
var deepLinkNavigationLink: some View {
NavigationLink(
destination: deepLinkChatDestination,