Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Problem with course menu position on iPad and in Landscape mode on iPhone #292

Merged
merged 53 commits into from
Mar 21, 2024
Merged

feat: Problem with course menu position on iPad and in Landscape mode on iPhone #292

Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
0325be9
fix: iPad register and login buttons
forgotvas Feb 26, 2024
eddb20b
fix: IPad sign up view
forgotvas Feb 26, 2024
4ecd72d
fix: iPad Course outline view
forgotvas Feb 26, 2024
a3eec7d
feat: added IPAD_STRETCH config parameter
forgotvas Feb 27, 2024
1e6b3d8
fix: size bug on small device
forgotvas Feb 27, 2024
57b54cd
fix: iPad stretch for content types
forgotvas Feb 27, 2024
37c4e27
fix: player on iPad and small devices
forgotvas Feb 27, 2024
94685e7
Merge remote-tracking branch 'upstream/develop' into feat/ipad-stretch
forgotvas Feb 27, 2024
df286b0
fix: stretch for search bar on discussions page
forgotvas Feb 27, 2024
0fd8866
fix: discussion search bar stretch
forgotvas Feb 27, 2024
9620a8d
fix: bug of player on small devices
forgotvas Feb 27, 2024
935879d
fix: removed stretching for sign up/sign in views
forgotvas Feb 27, 2024
d5f1665
feat: removed feature flag
forgotvas Feb 27, 2024
9b6b755
feat: added readable content size
forgotvas Feb 28, 2024
3fad0c5
fix: added readable content size to startup screen
forgotvas Feb 28, 2024
d1f75df
fix: sign in, sign up, reset password readable paddings
forgotvas Feb 28, 2024
c38e3a9
fix: scroll bar position for edit profile view
forgotvas Feb 28, 2024
f3eacc7
fix: social buttons
forgotvas Feb 29, 2024
cd69586
feat: added readability and accessibility injections
forgotvas Mar 5, 2024
89ff0df
fix: resize of content and added readability for content types
forgotvas Mar 5, 2024
f6ffabf
fix: readability width calculation
forgotvas Mar 5, 2024
324ef3e
feat: added Discussons paddings
forgotvas Mar 5, 2024
b2a135c
feat: added iPad paddings for Dates tab
forgotvas Mar 5, 2024
ae9110c
feat: added injection to html webview
forgotvas Mar 5, 2024
5542bb6
feat: added readable for profile
forgotvas Mar 5, 2024
a2cacf2
feat: added padding for tab menu
forgotvas Mar 5, 2024
3bf24ac
feat: added paddings to dashboard view
forgotvas Mar 5, 2024
34b59b8
Merge branch 'develop' into feat/ipad-stretch
forgotvas Mar 5, 2024
5c36ce7
fix: merge conflict
forgotvas Mar 5, 2024
2360964
feat: moved filter buttons
forgotvas Mar 5, 2024
f839120
feat: added paddings to Delete Account View
forgotvas Mar 5, 2024
4b010db
feat: added paddings for native discovery view
forgotvas Mar 5, 2024
b74e5e1
feat: added padding for CourseVerticalsView
forgotvas Mar 5, 2024
a4117f4
feat: added paddings for responses view
forgotvas Mar 5, 2024
9ee316f
feat: added paddings to UserProfileView
forgotvas Mar 5, 2024
e06bd3f
fix: do not block scroll from side for UserProfileView
forgotvas Mar 5, 2024
8a1d639
chore: review's changes
forgotvas Mar 6, 2024
827b928
Merge remote-tracking branch 'upstream/develop' into feat/ipad-stretch
forgotvas Mar 11, 2024
60dc883
chore: merge conflicts
forgotvas Mar 11, 2024
83ce735
chore: merge conflict
forgotvas Mar 11, 2024
70f10be
chore: warning
forgotvas Mar 11, 2024
8db58a4
Merge remote-tracking branch 'upstream/develop' into feat/ipad-stretch
forgotvas Mar 15, 2024
7b5db6d
fix: merge conflicts
forgotvas Mar 15, 2024
7bb2974
Merge remote-tracking branch 'upstream/develop' into feat/ipad-stretch
forgotvas Mar 19, 2024
7f27c1d
Merge remote-tracking branch 'upstream/develop' into feat/ipad-stretch
forgotvas Mar 20, 2024
82f0d70
chore: merge conflict
forgotvas Mar 20, 2024
fa97432
chore: removed extra horizontal padding
forgotvas Mar 20, 2024
2f6c115
chore: refactor
forgotvas Mar 20, 2024
e0d5347
chore: label alignment
forgotvas Mar 20, 2024
c68bbd5
Merge remote-tracking branch 'upstream/develop' into feat/ipad-stretch
forgotvas Mar 21, 2024
65fad57
chore: merge conflicts
forgotvas Mar 21, 2024
fc1150a
chore: status bar fix
forgotvas Mar 21, 2024
741c643
chore: merge conflict
forgotvas Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 104 additions & 101 deletions Authorization/Authorization/Presentation/Login/SignInView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,117 +56,120 @@ public struct SignInView: View {
.padding(.bottom, isHorizontal ? 10 : 40)
.accessibilityIdentifier("logo_image")

ScrollView {
VStack {
VStack(alignment: .leading) {
Text(AuthLocalization.SignIn.logInTitle)
.font(Theme.Fonts.displaySmall)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.bottom, 4)
.accessibilityIdentifier("signin_text")
Text(AuthLocalization.SignIn.welcomeBack)
.font(Theme.Fonts.titleSmall)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.bottom, 20)
.accessibilityIdentifier("welcome_back_text")

Text(AuthLocalization.SignIn.emailOrUsername)
.font(Theme.Fonts.labelLarge)
.foregroundColor(Theme.Colors.textPrimary)
.accessibilityIdentifier("username_text")
TextField(AuthLocalization.SignIn.emailOrUsername, text: $email)
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.textPrimary)
.keyboardType(.emailAddress)
.textContentType(.emailAddress)
.autocapitalization(.none)
.autocorrectionDisabled()
.padding(.all, 14)
.background(
Theme.Shapes.textInputShape
.fill(Theme.Colors.textInputBackground)
)
.overlay(
Theme.Shapes.textInputShape
.stroke(lineWidth: 1)
.fill(Theme.Colors.textInputStroke)
)
.accessibilityIdentifier("username_textfield")

Text(AuthLocalization.SignIn.password)
.font(Theme.Fonts.labelLarge)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.top, 18)
.accessibilityIdentifier("password_text")
SecureField(AuthLocalization.SignIn.password, text: $password)
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.all, 14)
.background(
Theme.Shapes.textInputShape
.fill(Theme.Colors.textInputBackground)
)
.overlay(
Theme.Shapes.textInputShape
.stroke(lineWidth: 1)
.fill(Theme.Colors.textInputStroke)
)
.accessibilityIdentifier("password_textfield")
HStack {
if !viewModel.config.features.startupScreenEnabled {
Button(CoreLocalization.SignIn.registerBtn) {
viewModel.router.showRegisterScreen(sourceScreen: viewModel.sourceScreen)
GeometryReader { proxy in
ScrollView {
VStack {
VStack(alignment: .leading) {
Text(AuthLocalization.SignIn.logInTitle)
.font(Theme.Fonts.displaySmall)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.bottom, 4)
.accessibilityIdentifier("signin_text")
Text(AuthLocalization.SignIn.welcomeBack)
.font(Theme.Fonts.titleSmall)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.bottom, 20)
.accessibilityIdentifier("welcome_back_text")

Text(AuthLocalization.SignIn.emailOrUsername)
.font(Theme.Fonts.labelLarge)
.foregroundColor(Theme.Colors.textPrimary)
.accessibilityIdentifier("username_text")
TextField(AuthLocalization.SignIn.emailOrUsername, text: $email)
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.textPrimary)
.keyboardType(.emailAddress)
.textContentType(.emailAddress)
.autocapitalization(.none)
.autocorrectionDisabled()
.padding(.all, 14)
.background(
Theme.Shapes.textInputShape
.fill(Theme.Colors.textInputBackground)
)
.overlay(
Theme.Shapes.textInputShape
.stroke(lineWidth: 1)
.fill(Theme.Colors.textInputStroke)
)
.accessibilityIdentifier("username_textfield")

Text(AuthLocalization.SignIn.password)
.font(Theme.Fonts.labelLarge)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.top, 18)
.accessibilityIdentifier("password_text")
SecureField(AuthLocalization.SignIn.password, text: $password)
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.textPrimary)
.padding(.all, 14)
.background(
Theme.Shapes.textInputShape
.fill(Theme.Colors.textInputBackground)
)
.overlay(
Theme.Shapes.textInputShape
.stroke(lineWidth: 1)
.fill(Theme.Colors.textInputStroke)
)
.accessibilityIdentifier("password_textfield")
HStack {
if !viewModel.config.features.startupScreenEnabled {
Button(CoreLocalization.SignIn.registerBtn) {
viewModel.router.showRegisterScreen(sourceScreen: viewModel.sourceScreen)
}
.foregroundColor(Theme.Colors.accentColor)
.accessibilityIdentifier("register_button")

Spacer()
}
.foregroundColor(Theme.Colors.accentColor)
.accessibilityIdentifier("register_button")

Spacer()
Button(AuthLocalization.SignIn.forgotPassBtn) {
viewModel.trackForgotPasswordClicked()
viewModel.router.showForgotPasswordScreen()
}
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.accentXColor)
.padding(.top, 0)
.accessibilityIdentifier("forgot_password_button")
}

Button(AuthLocalization.SignIn.forgotPassBtn) {
viewModel.trackForgotPasswordClicked()
viewModel.router.showForgotPasswordScreen()

if viewModel.isShowProgress {
HStack(alignment: .center) {
ProgressBar(size: 40, lineWidth: 8)
.padding(20)
.accessibilityIdentifier("progressbar")
}.frame(maxWidth: .infinity)
} else {
StyledButton(CoreLocalization.SignIn.logInBtn) {
Task {
await viewModel.login(username: email, password: password)
}
}
.frame(maxWidth: .infinity)
.padding(.top, 40)
.accessibilityIdentifier("signin_button")
}
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.accentXColor)
.padding(.top, 0)
.accessibilityIdentifier("forgot_password_button")
}

if viewModel.isShowProgress {
HStack(alignment: .center) {
ProgressBar(size: 40, lineWidth: 8)
.padding(20)
.accessibilityIdentifier("progressbar")
}.frame(maxWidth: .infinity)
} else {
StyledButton(CoreLocalization.SignIn.logInBtn) {
Task {
await viewModel.login(username: email, password: password)
if viewModel.socialAuthEnabled {
SocialAuthView(
viewModel: .init(
config: viewModel.config
) { result in
Task { await viewModel.login(with: result) }
}
}
.frame(maxWidth: .infinity)
.padding(.top, 40)
.accessibilityIdentifier("signin_button")
)
}
agreements
Spacer()
}
if viewModel.socialAuthEnabled {
SocialAuthView(
viewModel: .init(
config: viewModel.config
) { result in
Task { await viewModel.login(with: result) }
}
)
}
agreements
Spacer()
.padding(.horizontal, 24)
.padding(.top, 50)
.frameLimit(width: proxy.size.width)
}
.padding(.horizontal, 24)
.padding(.top, 50)
}.roundedBackground(Theme.Colors.loginBackground)
.roundedBackground(Theme.Colors.loginBackground)
.scrollAvoidKeyboard(dismissKeyboardByTap: true)

}
}

// MARK: - Alert
Expand Down
2 changes: 1 addition & 1 deletion Authorization/Authorization/Presentation/Registration/SignUpView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public struct SignUpView: View {
}
.padding(.horizontal, 24)
.padding(.top, 24)

.frameLimit(width: proxy.size.width)
}
.roundedBackground(Theme.Colors.background)
.onRightSwipeGesture {
Expand Down
Loading
Loading