Skip to content

SK-608: UI moved on password field #104

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

Merged
artem-yatchenko merged 20 commits into from
Jan 21, 2026
Merged

SK-608: UI moved on password field #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
26c9fe8
SK-567: flutter sdk development (#90)
CubeRomanMagellan Nov 10, 2025
41d1788
SK-578: share to image (#91)
CubeRomanMagellan Nov 23, 2025
72acc9a
add check for deleted user opponent (#93)
CubeRomanMagellan Nov 23, 2025
586bf9d
add MediaAttachmentBloc to menu (#95)
CubeRomanMagellan Nov 23, 2025
3e176b2
SK-589: implement ability to take a photo (#92)
CubeRomanMagellan Nov 25, 2025
bcb6aac
SK-587: Hard back does not work (#94)
CubeRomanMagellan Nov 25, 2025
da088cc
fix app routing (#96)
CubeRomanMagellan Dec 2, 2025
5ee84b6
add blocking (#97)
CubeRomanMagellan Dec 2, 2025
969d62a
add auto complete (#98)
CubeRomanMagellan Dec 9, 2025
e7d956b
fix reply bubble (#99)
CubeRomanMagellan Dec 9, 2025
cae8d00
update login page
Dec 13, 2025
4632163
add expending to reset password
Dec 16, 2025
9e93430
add fresh icons to chat list
Dec 19, 2025
2aed2ed
update avatar view
Dec 23, 2025
7613aa3
update profile card
Dec 23, 2025
f3ab5c6
add card to profile
Jan 5, 2026
f80ae4c
Merge remote-tracking branch 'origin/development' into SK-606-Update_…
Jan 8, 2026
35fae3e
update text button form error
Jan 8, 2026
b9f392c
increase font size
Jan 9, 2026
91d7500
Merge remote-tracking branch 'origin/development' into SK-608-UI_move…
Jan 21, 2026
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
2 changes: 1 addition & 1 deletion sama_chat_client/lib/src/features/login/view/login_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ class _EmailInput extends StatelessWidget {
? state.email.displayError == EmailValidationError.empty
? 'Email is too short'
: state.email.displayError == EmailValidationError.incorrect
? 'The format of the email address is incorrect'
? 'The format of the email is incorrect'
: null
: null);
},
Expand Down
2 changes: 1 addition & 1 deletion sama_chat_client/lib/src/features/profile/view/profile_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ class InfoDialogInput extends StatelessWidget {
),
errorText: state.userEmail.displayError ==
UserEmailValidationError.incorrect
? 'The format of the email address is incorrect.'
? 'The format of the email is incorrect.'
: null,
),
),
Expand Down
7 changes: 4 additions & 3 deletions sama_chat_client/lib/src/features/reset_password/view/send_email_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ class SendEmailForm extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text('Reset password'),
const Text('Reset password', style: TextStyle(fontSize: 20)),
const Padding(padding: EdgeInsets.all(8)),
const Text(
'To reset your password, enter the email that you used to create your account',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 12,
fontSize: 14,
)),
const Padding(padding: EdgeInsets.all(8)),
_EmailInput(),
Expand Down Expand Up @@ -63,7 +64,7 @@ class _EmailInput extends StatelessWidget {
? state.email.displayError == EmailValidationError.empty
? 'Email is too short'
: state.email.displayError == EmailValidationError.incorrect
? 'The format of the email address is incorrect'
? 'The format of the email is incorrect'
: null
: null);
},
Expand Down
13 changes: 7 additions & 6 deletions sama_chat_client/lib/src/features/reset_password/view/send_otp_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ class SendOtpForm extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text('Reset password'),
const Text('Reset password', style: TextStyle(fontSize: 20)),
const Padding(padding: EdgeInsets.all(8)),
Text(
'We have sent a verification code to ${context.read<ResetPasswordBloc>().state.email.value}',
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 12,
fontSize: 14,
)),
const Padding(padding: EdgeInsets.all(8)),
const OtpInput(),
Expand Down Expand Up @@ -127,10 +127,11 @@ class OtpInputState extends State<OtpInput> {
),
const Padding(
padding: EdgeInsets.all(8.0),
child: Text(
"Enter the 6 digit OTP sent to your email",
textAlign: TextAlign.center,
),
child: Text("Enter the 6 digit OTP sent to your email",
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 16,
)),
),
Padding(
padding: const EdgeInsets.all(8.0),
Expand Down
2 changes: 1 addition & 1 deletion sama_chat_client/lib/src/features/reset_password/view/send_reset_password_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SendResetPasswordForm extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text('Set new password'),
const Text('Set new password', style: TextStyle(fontSize: 20)),
const Padding(padding: EdgeInsets.all(8)),
_PasswordInput(),
const Padding(padding: EdgeInsets.all(8)),
Expand Down
15 changes: 7 additions & 8 deletions sama_chat_client/lib/src/shared/ui/view/text_button_forms.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ class TextFieldForm extends StatelessWidget {
onChanged: (username) => onChanged(username),
decoration: InputDecoration(
border: InputBorder.none,
floatingLabelBehavior: error != null
? FloatingLabelBehavior.never
: FloatingLabelBehavior.auto,
contentPadding: const EdgeInsets.only(left: 12.0),
isDense: true,
label: Row(
Expand All @@ -53,13 +50,15 @@ class TextFieldForm extends StatelessWidget {
size: 26,
color: dullGray,
),
Text(
hint,
style: const TextStyle(color: dullGray, fontSize: 16),
)
Expanded(
child: Text(
error ?? hint,
style: TextStyle(
color: error != null ? red : dullGray, fontSize: 16),
overflow: TextOverflow.ellipsis,
))
],
),
errorText: error,
suffixIcon: Padding(
padding: const EdgeInsets.only(right: 8),
child: suffix ?? const SizedBox(),
Expand Down