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

fix: remove dependency on inset-box-shadow [#87] #95

Merged
merged 1 commit into from
Jan 17, 2025
Merged

fix: remove dependency on inset-box-shadow [#87] #95

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
23 changes: 7 additions & 16 deletions packages/clerk_flutter/lib/src/widgets/common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import 'package:clerk_flutter/src/widgets/ui/style/colors.dart';
import 'package:flutter/material.dart' hide BoxDecoration, BoxShadow;
import 'package:flutter_inset_box_shadow/flutter_inset_box_shadow.dart';
import 'package:phone_input/phone_input_package.dart';

extension NullExtension on String {
Expand Down Expand Up @@ -31,22 +30,13 @@ const outlineInputBorder = OutlineInputBorder(
borderSide: BorderSide.none,
);

const insetBoxShadow = [
BoxShadow(
color: ClerkColors.seashell,
blurRadius: 5.0,
offset: Offset(1.0, 1.0),
inset: true,
const inputBoxBorderDecoration = ShapeDecoration(
color: ClerkColors.white,
shape: RoundedRectangleBorder(
side: BorderSide(color: ClerkColors.dawnPink, width: 0.5),
borderRadius: borderRadius4,
),
BoxShadow(
color: ClerkColors.seashell,
blurRadius: 5.0,
offset: Offset(-1.0, -1.0),
inset: true,
),
];

const insetBoxShadowDecoration = BoxDecoration(boxShadow: insetBoxShadow);
);

const firstColumnWidth = 215.0;
const secondColumnWidth = 280.0;
Expand Down Expand Up @@ -183,6 +173,7 @@ const endPadding32 = EdgeInsetsDirectional.only(end: 32.0);
const endPadding48 = EdgeInsetsDirectional.only(end: 48.0);

const borderRadius4 = BorderRadius.all(Radius.circular(4.0));
const borderRadius6 = BorderRadius.all(Radius.circular(6.0));
const borderRadius8 = BorderRadius.all(Radius.circular(8.0));
const borderRadius12 = BorderRadius.all(Radius.circular(12.0));
const borderRadius16 = BorderRadius.all(Radius.circular(16.0));
Expand Down
6 changes: 1 addition & 5 deletions packages/clerk_flutter/lib/src/widgets/ui/clerk_panel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ class ClerkPanel extends StatelessWidget {
return DefaultTextStyle(
style: ClerkTextStyle.subtitleDark.copyWith(height: 1.0),
child: DecoratedBox(
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(12)),
color: ClerkColors.white,
boxShadow: insetBoxShadow,
),
decoration: inputBoxBorderDecoration,
child: Padding(padding: padding, child: child),
),
);
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk_flutter/lib/src/widgets/ui/clerk_phone_number_form_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ClerkPhoneNumberFormField extends StatelessWidget {
),
verticalMargin4,
DecoratedBox(
decoration: insetBoxShadowDecoration,
decoration: inputBoxBorderDecoration,
child: _PhoneInput(
initial: initial,
defaultCountry: defaultCountry,
Expand Down
28 changes: 12 additions & 16 deletions packages/clerk_flutter/lib/src/widgets/ui/clerk_text_form_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,18 @@ class ClerkTextFormField extends StatelessWidget {
verticalMargin4,
SizedBox(
height: 32.0,
child: ClipRRect(
clipBehavior: Clip.antiAlias,
borderRadius: borderRadius8,
child: DecoratedBox(
decoration: insetBoxShadowDecoration,
child: _TextField(
label: label,
optional: optional,
obscureText: obscureText,
onChanged: onChanged,
onSubmit: onSubmit,
initial: initial,
onObscure: onObscure,
validator: validator,
autofocus: autofocus,
),
child: DecoratedBox(
decoration: inputBoxBorderDecoration,
child: _TextField(
label: label,
optional: optional,
obscureText: obscureText,
onChanged: onChanged,
onSubmit: onSubmit,
initial: initial,
onObscure: onObscure,
validator: validator,
autofocus: autofocus,
),
),
),
Expand Down
5 changes: 1 addition & 4 deletions packages/clerk_flutter/lib/src/widgets/user/clerk_user_profile_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ class _SecondChild extends StatelessWidget {
],
);
final primaryTag = DecoratedBox(
decoration: insetBoxShadowDecoration.copyWith(
color: ClerkColors.desertStorm,
borderRadius: borderRadius4,
),
decoration: inputBoxBorderDecoration,
child: Padding(
padding: verticalPadding4 + horizontalPadding8,
child: const Text(
Expand Down
1 change: 0 additions & 1 deletion packages/clerk_flutter/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ dependencies:
clerk_auth: ^0.0.4-dev
collection: ^1.17.1
email_validator: ^3.0.0
flutter_inset_box_shadow: ^1.0.8
flutter_svg: ^2.0.10+1
image_picker: ^1.0.7
path_provider: ^2.1.2
Expand Down
Loading