Skip to content

feat: minor theme updates #239

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
merged 2 commits into from
Mar 22, 2022
Merged

feat: minor theme updates #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0865e25
feat: minor theme updates
andrzejchm Mar 21, 2022
5660dd4
fix missing comma
andrzejchm Mar 21, 2022
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
26 changes: 21 additions & 5 deletions packages/cosmos_ui_components/lib/components/cosmos_elevated_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ class CosmosElevatedButton extends StatelessWidget {
this.prefixIcon,
this.height = GlobalConstants.defaultButtonHeight,
this.contentPadding,
this.elevation,
this.backgroundColor,
this.textColor,
this.shadowColor,
}) : super(key: key);

final VoidCallback? onTap;
Expand All @@ -21,29 +25,37 @@ class CosmosElevatedButton extends StatelessWidget {
final Widget? prefixIcon;
final double height;
final double? contentPadding;
final double? elevation;
final Color? backgroundColor;
final Color? textColor;
final Color? shadowColor;

@override
Widget build(BuildContext context) {
final theme = CosmosTheme.of(context);
return ElevatedButton(
onPressed: onTap,
style: ElevatedButton.styleFrom(
primary: backgroundColor,
onPrimary: textColor,
fixedSize: Size.fromHeight(height),
shape: RoundedRectangleBorder(borderRadius: CosmosTheme.of(context).borderRadiusM),
elevation: 0,
shape: RoundedRectangleBorder(borderRadius: theme.borderRadiusM),
elevation: elevation ?? 0,
shadowColor: shadowColor ?? theme.colors.shadowColor,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (prefixIcon != null) ...[
prefixIcon!,
SizedBox(width: contentPadding ?? CosmosTheme.of(context).spacingS),
SizedBox(width: contentPadding ?? theme.spacingS),
],
Text(
text,
style: CosmosTextTheme.elevatedButton,
),
if (suffixIcon != null) ...[
SizedBox(width: contentPadding ?? CosmosTheme.of(context).spacingS),
SizedBox(width: contentPadding ?? theme.spacingS),
suffixIcon!,
],
],
Expand All @@ -58,6 +70,10 @@ class CosmosElevatedButton extends StatelessWidget {
..add(DoubleProperty('contentPadding', contentPadding))
..add(DoubleProperty('height', height))
..add(StringProperty('text', text))
..add(ObjectFlagProperty<VoidCallback?>.has('onTap', onTap));
..add(ObjectFlagProperty<VoidCallback?>.has('onTap', onTap))
..add(DoubleProperty('elevation', elevation))
..add(ColorProperty('textColor', textColor))
..add(ColorProperty('backgroundColor', backgroundColor))
..add(ColorProperty('shadowColor', shadowColor));
}
}
38 changes: 19 additions & 19 deletions packages/cosmos_ui_components/lib/components/cosmos_text_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class CosmosTextField extends StatefulWidget {
this.hint,
this.keyboardType,
this.controller,
this.textAlign = TextAlign.start,
this.style,
Key? key,
}) : super(key: key);

Expand All @@ -26,6 +28,8 @@ class CosmosTextField extends StatefulWidget {
final Widget? suffix;
final TextInputType? keyboardType;
final TextEditingController? controller;
final TextAlign textAlign;
final TextStyle? style;

@override
State<CosmosTextField> createState() => _CosmosTextFieldState();
Expand All @@ -41,26 +45,28 @@ class CosmosTextField extends StatefulWidget {
..add(IntProperty('minLines', minLines))
..add(ObjectFlagProperty<Function(String p1)>.has('onChanged', onChanged))
..add(DiagnosticsProperty<TextEditingController?>('controller', controller))
..add(StringProperty('hint', hint));
..add(StringProperty('hint', hint))
..add(EnumProperty<TextAlign>('textAlign', textAlign))
..add(DiagnosticsProperty<TextStyle?>('style', style));
}
}

class _CosmosTextFieldState extends State<CosmosTextField> {
late TextEditingController controller;
bool isTextEmpty = false;
late TextEditingController _controller;
bool _isTextEmpty = false;

@override
void initState() {
super.initState();
controller = widget.controller ?? TextEditingController();
controller.text = widget.initialText;
_controller = widget.controller ?? TextEditingController();
_controller.text = widget.initialText;
}

@override
void dispose() {
if (widget.controller == null) {
// it's a controller created internally by the CosmosTextField, thus we'll take care of disposing it properly here
controller.dispose();
_controller.dispose();
}
super.dispose();
}
Expand All @@ -69,18 +75,20 @@ class _CosmosTextFieldState extends State<CosmosTextField> {
Widget build(BuildContext context) {
final theme = CosmosTheme.of(context);
return TextField(
controller: controller,
controller: _controller,
maxLines: widget.maxLines,
maxLength: widget.maxLength,
minLines: widget.minLines,
keyboardType: widget.keyboardType,
onChanged: (value) {
widget.onChanged(value);
if (value.isEmpty == isTextEmpty) {
if (value.isEmpty == _isTextEmpty) {
setState(() {});
isTextEmpty = !isTextEmpty;
_isTextEmpty = !_isTextEmpty;
}
},
textAlign: widget.textAlign,
style: widget.style,
decoration: InputDecoration(
counterText: widget.maxLength == null ? null : '',
border: UnderlineInputBorder(borderSide: BorderSide(color: theme.colors.inputBorder)),
Expand All @@ -90,15 +98,15 @@ class _CosmosTextFieldState extends State<CosmosTextField> {
),
suffix: widget.suffix == null
? _buildClearButton()
: (controller.text.isEmpty ? widget.suffix : _buildClearButton()),
: (_controller.text.isEmpty ? widget.suffix : _buildClearButton()),
),
);
}

InkWell _buildClearButton() {
return InkWell(
onTap: () {
controller.clear();
_controller.clear();
setState(() {});
},
child: SizedBox(
Expand All @@ -108,12 +116,4 @@ class _CosmosTextFieldState extends State<CosmosTextField> {
),
);
}

@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
properties
..add(DiagnosticsProperty<TextEditingController>('controller', controller))
..add(DiagnosticsProperty<bool>('isTextEmpty', isTextEmpty));
}
}
18 changes: 18 additions & 0 deletions packages/cosmos_ui_components/lib/cosmos_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class CosmosTheme extends InheritedWidget {

@override
bool updateShouldNotify(CosmosTheme oldWidget) => oldWidget.themeData != themeData;

@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
Expand Down Expand Up @@ -60,6 +61,8 @@ class CosmosThemeData extends Equatable {
this.borderRadiusM = defaultBorderRadiusM,
this.borderRadiusS = defaultBorderRadiusS,
this.elevationS = defaultElevationS,
this.elevationM = defaultElevationM,
this.elevationL = defaultElevationL,
this.colors = const CosmosColorsData(),
});

Expand Down Expand Up @@ -88,6 +91,8 @@ class CosmosThemeData extends Equatable {
static const defaultFontSizeXL = 28.0;
static const defaultFontSizeXXL = 40.0;
static const defaultElevationS = 4.0;
static const defaultElevationM = 8.0;
static const defaultElevationL = 12.0;

static const defaultBorderRadiusL = BorderRadius.all(Radius.circular(defaultRadiusL));
static const defaultBorderRadiusM = BorderRadius.all(Radius.circular(defaultRadiusM));
Expand All @@ -113,6 +118,8 @@ class CosmosThemeData extends Equatable {
final double fontSizeXL;
final double fontSizeXXL;
final double elevationS;
final double elevationM;
final double elevationL;
final BorderRadius borderRadiusM;
final BorderRadius borderRadiusL;
final BorderRadius borderRadiusS;
Expand All @@ -122,6 +129,7 @@ class CosmosThemeData extends Equatable {
List<Object?> get props => [
spacingXXXL,
spacingXXL,
spacingXL,
spacingL,
spacingM,
spacingS,
Expand All @@ -130,15 +138,21 @@ class CosmosThemeData extends Equatable {
mediumDuration,
shortDuration,
radiusXL,
radiusL,
radiusM,
radiusS,
fontSizeS,
fontSizeM,
fontSizeL,
fontSizeXL,
fontSizeXXL,
borderRadiusL,
borderRadiusM,
borderRadiusS,
elevationS,
elevationM,
elevationL,
colors,
];
}

Expand All @@ -157,6 +171,7 @@ class CosmosColorsData extends Equatable {
this.inputBorder = lightBorder,
this.avatarBg = silver,
this.error = defaultError,
this.shadowColor = defaultShadowColor,
});

static const lightBg = Color(0xFFFFFFFF);
Expand All @@ -179,6 +194,7 @@ class CosmosColorsData extends Equatable {
static const darkDivider = Color(0x17FFFFFF);
static const iosError = Color(0xFFE74444);
static const defaultError = Color(0xFFFF3D56);
static const defaultShadowColor = Colors.black38;

final Color inactive;
final Color divider;
Expand All @@ -193,6 +209,7 @@ class CosmosColorsData extends Equatable {
final Color inputBorder;
final Color avatarBg;
final Color error;
final Color shadowColor;

@override
List<Object?> get props => [
Expand All @@ -209,5 +226,6 @@ class CosmosColorsData extends Equatable {
inputBorder,
avatarBg,
error,
shadowColor,
];
}