Skip to content

Commit 67363cc

Browse files
CubeRomanMagellanMagellan
andauthored
SK-608: UI moved on password field (#104)
* SK-567: flutter sdk development (#90) * create monorepo * add api * remove client old api * add tokens management * rename sama_chat_api to sama_sdk * SK-578: share to image (#91) * create monorepo * add api * remove client old api * add tokens management * rename sama_chat_api to sama_sdk * add image share to support * fix Popup with Send Image after share again --------- Co-authored-by: Magellan <magellan@connectycube.com> * add check for deleted user opponent (#93) Co-authored-by: Magellan <magellan@connectycube.com> * add MediaAttachmentBloc to menu (#95) Co-authored-by: Magellan <magellan@connectycube.com> * SK-589: implement ability to take a photo (#92) * create monorepo * add api * remove client old api * add tokens management * rename sama_chat_api to sama_sdk * add image share to support * add image_picker * add camera picker * update agpVersion --------- Co-authored-by: Magellan <magellan@connectycube.com> * SK-587: Hard back does not work (#94) * add pop invoke * minor fix didPop * add swipe ios impl --------- Co-authored-by: Magellan <magellan@connectycube.com> * fix app routing (#96) Co-authored-by: Magellan <magellan@connectycube.com> * add blocking (#97) Co-authored-by: Magellan <magellan@connectycube.com> * add auto complete (#98) Co-authored-by: Magellan <magellan@connectycube.com> * fix reply bubble (#99) Co-authored-by: Magellan <magellan@connectycube.com> * update login page * add expending to reset password * add fresh icons to chat list * update avatar view * update profile card * add card to profile * update text button form error * increase font size --------- Co-authored-by: Magellan <magellan@connectycube.com>
1 parent c1e5090 commit 67363cc

6 files changed

Lines changed: 21 additions & 20 deletions

File tree

sama_chat_client/lib/src/features/login/view/login_form.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class _EmailInput extends StatelessWidget {
240240
? state.email.displayError == EmailValidationError.empty
241241
? 'Email is too short'
242242
: state.email.displayError == EmailValidationError.incorrect
243-
? 'The format of the email address is incorrect'
243+
? 'The format of the email is incorrect'
244244
: null
245245
: null);
246246
},

sama_chat_client/lib/src/features/profile/view/profile_form.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ class InfoDialogInput extends StatelessWidget {
532532
),
533533
errorText: state.userEmail.displayError ==
534534
UserEmailValidationError.incorrect
535-
? 'The format of the email address is incorrect.'
535+
? 'The format of the email is incorrect.'
536536
: null,
537537
),
538538
),

sama_chat_client/lib/src/features/reset_password/view/send_email_form.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ class SendEmailForm extends StatelessWidget {
2828
child: Column(
2929
mainAxisSize: MainAxisSize.min,
3030
children: [
31-
const Text('Reset password'),
31+
const Text('Reset password', style: TextStyle(fontSize: 20)),
3232
const Padding(padding: EdgeInsets.all(8)),
3333
const Text(
3434
'To reset your password, enter the email that you used to create your account',
35+
textAlign: TextAlign.center,
3536
style: TextStyle(
36-
fontSize: 12,
37+
fontSize: 14,
3738
)),
3839
const Padding(padding: EdgeInsets.all(8)),
3940
_EmailInput(),
@@ -63,7 +64,7 @@ class _EmailInput extends StatelessWidget {
6364
? state.email.displayError == EmailValidationError.empty
6465
? 'Email is too short'
6566
: state.email.displayError == EmailValidationError.incorrect
66-
? 'The format of the email address is incorrect'
67+
? 'The format of the email is incorrect'
6768
: null
6869
: null);
6970
},

sama_chat_client/lib/src/features/reset_password/view/send_otp_form.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ class SendOtpForm extends StatelessWidget {
2828
return Column(
2929
mainAxisSize: MainAxisSize.min,
3030
children: [
31-
const Text('Reset password'),
31+
const Text('Reset password', style: TextStyle(fontSize: 20)),
3232
const Padding(padding: EdgeInsets.all(8)),
3333
Text(
3434
'We have sent a verification code to ${context.read<ResetPasswordBloc>().state.email.value}',
3535
textAlign: TextAlign.center,
3636
style: const TextStyle(
37-
fontSize: 12,
37+
fontSize: 14,
3838
)),
3939
const Padding(padding: EdgeInsets.all(8)),
4040
const OtpInput(),
@@ -127,10 +127,11 @@ class OtpInputState extends State<OtpInput> {
127127
),
128128
const Padding(
129129
padding: EdgeInsets.all(8.0),
130-
child: Text(
131-
"Enter the 6 digit OTP sent to your email",
132-
textAlign: TextAlign.center,
133-
),
130+
child: Text("Enter the 6 digit OTP sent to your email",
131+
textAlign: TextAlign.center,
132+
style: const TextStyle(
133+
fontSize: 16,
134+
)),
134135
),
135136
Padding(
136137
padding: const EdgeInsets.all(8.0),

sama_chat_client/lib/src/features/reset_password/view/send_reset_password_form.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class SendResetPasswordForm extends StatelessWidget {
3535
child: Column(
3636
mainAxisSize: MainAxisSize.min,
3737
children: [
38-
const Text('Set new password'),
38+
const Text('Set new password', style: TextStyle(fontSize: 20)),
3939
const Padding(padding: EdgeInsets.all(8)),
4040
_PasswordInput(),
4141
const Padding(padding: EdgeInsets.all(8)),

sama_chat_client/lib/src/shared/ui/view/text_button_forms.dart

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ class TextFieldForm extends StatelessWidget {
4040
onChanged: (username) => onChanged(username),
4141
decoration: InputDecoration(
4242
border: InputBorder.none,
43-
floatingLabelBehavior: error != null
44-
? FloatingLabelBehavior.never
45-
: FloatingLabelBehavior.auto,
4643
contentPadding: const EdgeInsets.only(left: 12.0),
4744
isDense: true,
4845
label: Row(
@@ -53,13 +50,15 @@ class TextFieldForm extends StatelessWidget {
5350
size: 26,
5451
color: dullGray,
5552
),
56-
Text(
57-
hint,
58-
style: const TextStyle(color: dullGray, fontSize: 16),
59-
)
53+
Expanded(
54+
child: Text(
55+
error ?? hint,
56+
style: TextStyle(
57+
color: error != null ? red : dullGray, fontSize: 16),
58+
overflow: TextOverflow.ellipsis,
59+
))
6060
],
6161
),
62-
errorText: error,
6362
suffixIcon: Padding(
6463
padding: const EdgeInsets.only(right: 8),
6564
child: suffix ?? const SizedBox(),

0 commit comments

Comments
 (0)