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

patch

Browse Source
This commit is contained in:
cheykrym 2025-12-03 07:11:36 +03:00
parent f9026ebf87
commit b8ffca967b
2 changed files with 79 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yobble/Resources/Localizable.xcstrings
View File

@ -400,6 +400,9 @@
},
"Вход по коду пока недоступен. Заглушка." : {
},
"Вход по паролю" : {
},
"Вы" : {
"localizations" : {
@ -540,6 +543,9 @@
}
}
}
},
"Если предпочитаете классический вход, используйте логин и пароль." : {
},
"Заблокированные" : {

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

@ -103,38 +103,9 @@ struct PasswordLoginView: View {
}
var body: some View {
ZStack {
Color.clear // чтобы поймать тап
.contentShape(Rectangle())
.onTapGesture {
focusedField = nil
}
VStack {
HStack {
Button(action: openLanguageSettings) {
Text("🌍")
.padding()
}
Spacer()
Menu {
ForEach(themeOptions) { option in
Button(action: { selectTheme(option) }) {
themeMenuContent(for: option)
.opacity(option.isEnabled ? 1.0 : 0.5)
}
.disabled(!option.isEnabled)
}
} label: {
Image(systemName: themeIconName)
.padding()
}
}
.onTapGesture {
focusedField = nil
}
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: 24) {
LoginTopBar(openLanguageSettings: openLanguageSettings)
Button {
focusedField = nil
@ -142,22 +113,26 @@ struct PasswordLoginView: View {
viewModel.showPasswordlessRequest()
}
} label: {
HStack(spacing: 4) {
HStack(spacing: 6) {
Image(systemName: "arrow.left")
Text(NSLocalizedString("Войти по коду", comment: ""))
}
.font(.footnote)
.foregroundColor(.blue)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.top, 4)
}
Spacer()
VStack(alignment: .leading, spacing: 8) {
Text(NSLocalizedString("Вход по паролю", comment: ""))
.font(.largeTitle).bold()
Text(NSLocalizedString("Если предпочитаете классический вход, используйте логин и пароль.", comment: ""))
.foregroundColor(.secondary)
}
VStack(alignment: .leading, spacing: 12) {
TextField(NSLocalizedString("Логин", comment: ""), text: $viewModel.username)
.padding()
.background(Color(.secondarySystemBackground))
.cornerRadius(8)
.cornerRadius(12)
.autocapitalization(.none)
.disableAutocorrection(true)
.focused($focusedField, equals: .username)
@ -167,18 +142,16 @@ struct PasswordLoginView: View {
}
}
// Показываем ошибку для логина
if !isUsernameValid && !viewModel.username.isEmpty {
Text(NSLocalizedString("Неверный логин", comment: "Неверный логин"))
.foregroundColor(.red)
.font(.caption)
}
// Показываем поле пароля
SecureField(NSLocalizedString("Пароль", comment: ""), text: $viewModel.password)
.padding()
.background(Color(.secondarySystemBackground))
.cornerRadius(8)
.cornerRadius(12)
.autocapitalization(.none)
.focused($focusedField, equals: .password)
.onChange(of: viewModel.password) { newValue in
@ -187,21 +160,12 @@ struct PasswordLoginView: View {
}
}
// Показываем ошибку для пароля
if !isPasswordValid && !viewModel.password.isEmpty {
Text(NSLocalizedString("Неверный пароль", comment: "Неверный пароль"))
.foregroundColor(.red)
.font(.caption)
}
// TermsAgreementCard(
// isAccepted: $viewModel.hasAcceptedTerms,
// openTerms: {
// viewModel.loadTermsIfNeeded()
// isShowingTerms = true
// }
// )
// .padding(.vertical, 12)
}
VStack(alignment: .leading, spacing: 4) {
Toggle(NSLocalizedString("Режим мессенжера", comment: ""), isOn: $isMessengerModeEnabled)
@ -212,7 +176,6 @@ struct PasswordLoginView: View {
.font(.footnote)
.foregroundColor(.secondary)
}
.padding(.vertical, 8)
Button(action: {
viewModel.login()
@ -220,40 +183,42 @@ struct PasswordLoginView: View {
if viewModel.isLoading {
ProgressView()
.progressViewStyle(CircularProgressViewStyle())
.padding()
.frame(maxWidth: .infinity)
.background(Color.gray.opacity(0.6))
.cornerRadius(8)
.padding()
} else {
Text(NSLocalizedString("Войти", comment: ""))
.foregroundColor(.white)
.padding()
.frame(maxWidth: .infinity)
.padding()
}
}
.background(isLoginButtonEnabled ? Color.blue : Color.gray)
.cornerRadius(8)
}
}
.cornerRadius(12)
.disabled(!isLoginButtonEnabled)
// Spacer()
// Кнопка регистрации
Button(action: {
isShowingRegistration = true
viewModel.hasAcceptedTerms = false
}) {
Text(NSLocalizedString("Нет аккаунта? Регистрация", comment: "Регистрация"))
.foregroundColor(.blue)
.frame(maxWidth: .infinity)
}
.padding(.top, 10)
.padding(.top, 4)
.sheet(isPresented: $isShowingRegistration) {
RegistrationView(viewModel: viewModel, isPresented: $isShowingRegistration)
}
Spacer()
Spacer(minLength: 0)
}
.padding(.vertical, 32)
}
.padding(.horizontal, 24)
.background(Color(.systemBackground).ignoresSafeArea())
.contentShape(Rectangle())
.onTapGesture {
focusedField = nil
}
.padding()
.loginErrorAlert(viewModel: viewModel)
.onAppear {
if !hasResetTermsOnAppear {
@ -264,15 +229,6 @@ struct PasswordLoginView: View {
showLegacySupportNotice = true
}
}
.onTapGesture {
focusedField = nil
}
if showLegacySupportNotice {
LegacySupportNoticeView(isPresented: $showLegacySupportNotice)
.transition(.opacity)
.zIndex(1)
}
}
.fullScreenCover(isPresented: $isShowingTerms) {
TermsFullScreenView(
isPresented: $isShowingTerms,
@ -290,6 +246,12 @@ struct PasswordLoginView: View {
}
}
}
.overlay(alignment: .center) {
if showLegacySupportNotice {
LegacySupportNoticeView(isPresented: $showLegacySupportNotice)
.transition(.opacity)
}
}
}
private var themeIconName: String {
switch themeManager.theme {