Skip to content

Fix/ text field padding #85

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

Open
ZainabAlnajjar wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −18
Open

Fix/ text field padding #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 2 additions & 12 deletions lib/design_system/widgets/text_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class MTextField extends StatefulWidget {
final String hint;
final String value;
final ValueChanged<String> onChanged;
final IconData? leadingIcon;
final Widget? leading;
final Widget? trailing;
final String? errorText;
Expand All @@ -20,7 +19,6 @@ class MTextField extends StatefulWidget {
required this.hint,
required this.value,
required this.onChanged,
this.leadingIcon,
this.leading,
this.trailing,
this.errorText,
Expand Down Expand Up @@ -78,7 +76,7 @@ class _MTextFieldState extends State<MTextField> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
// padding: const EdgeInsets.symmetric(horizontal: 16),
padding: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
border: Border.all(
Expand All @@ -95,15 +93,7 @@ class _MTextFieldState extends State<MTextField> {
colorFilter: ColorFilter.mode(activeColor, BlendMode.srcIn),
child: widget.leading!,
),
if (widget.leadingIcon != null)
Padding(
padding: EdgeInsets.only(top: 14, right: 8),
child: Icon(
widget.leadingIcon,
color: showBorder ? borderColor : colors.body,
size: 24,
),
),

Expanded(
child: TextField(
controller: _controller,
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/expense/expense_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class _ExpenseScreenState extends State<ExpenseScreen> {
value: _amount,
keyboardType: TextInputType.number,
leading: Padding(
padding: const EdgeInsets.only(top: 14, right: 8),
padding: const EdgeInsetsGeometry.directional(end: 8),
Copy link
Collaborator

@mohamedshemees mohamedshemees Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
padding: const EdgeInsetsGeometry.directional(end: 8),
padding: const EdgeInsetsDirectional.only(end: 8)

child: SvgPicture.asset(
AppAssets.icAmountGray,
width: 24,
Expand Down
3 changes: 1 addition & 2 deletions lib/presentation/income/screen/income_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class _IncomeScreenContent extends StatelessWidget {
value: state.amount != null ? state.amount!.toStringAsFixed(0) : '',
keyboardType: TextInputType.number,
leading: Padding(
padding: const EdgeInsets.only(top: 14, right: 8),
padding: const EdgeInsetsGeometry.directional(end: 8),
Copy link
Collaborator

@mohamedshemees mohamedshemees Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
padding: const EdgeInsetsGeometry.directional(end: 8),
padding: const EdgeInsetsDirectional.only(end: 8),

child: SvgPicture.asset(
AppAssets.icAmountGray,
width: 24,
Expand Down Expand Up @@ -211,7 +211,6 @@ class _IncomeScreenContent extends StatelessWidget {
}

Widget _buildSaveButton(BuildContext context, AddIncomeState state) {
final colors = context.colors;
final l10n = AppLocalizations.of(context)!;

return Padding(
Expand Down
6 changes: 3 additions & 3 deletions lib/presentation/login/widget/login_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class _LoginFormState extends State<LoginForm> {
MTextField(
hint: localizations.login_email_hint,
leading: Padding(
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 8),
padding: const EdgeInsetsGeometry.directional(end: 8),
child: SvgPicture.asset(AppAssets.email),
),
onChanged: widget.onEmailChanged,
Expand All @@ -46,7 +46,7 @@ class _LoginFormState extends State<LoginForm> {
maxLines: 1,
obscureText: !_isPasswordVisible,
leading: Padding(
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 8),
padding: const EdgeInsetsGeometry.directional(end: 8),
Copy link
Collaborator

@mohamedshemees mohamedshemees Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
padding: const EdgeInsetsGeometry.directional(end: 8),
padding: const EdgeInsetsDirectional.only(end: 8),

child: SvgPicture.asset(AppAssets.lock),
),
trailing: GestureDetector(
Expand All @@ -56,7 +56,7 @@ class _LoginFormState extends State<LoginForm> {
});
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 8),
padding: const EdgeInsets.symmetric(vertical: 14),
child: SvgPicture.asset(
_isPasswordVisible ? AppAssets.eyeOpen : AppAssets.eyeClose,
),
Expand Down