SaveFamily/sf-app-platform
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
AlcalaJulian
2025-12-04 10:45:10 +01:00
parent 9d7f940851
commit a64a9a2a32
7 changed files with 181 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/design_system/lib/src/buttons/custom_text_button.dart
View File

@@ -1,28 +1,27 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class CustomTextButton extends StatelessWidget{ class CustomTextButton extends StatelessWidget {
final VoidCallback onPressed;
final onPressed;
final String text; final String text;
final double size; final double size;
final FontWeight weight; final FontWeight weight;
final Color? color; final Color? color;
@override
const CustomTextButton({ const CustomTextButton({
super.key, super.key,
required this.onPressed, required this.onPressed,
required this.text, required this.text,
this.size = 14, this.size = 14,
this.weight = FontWeight.normal, this.weight = FontWeight.normal,
this.color this.color,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return TextButton( return TextButton(
style: ButtonStyle(padding: WidgetStatePropertyAll(EdgeInsets.zero)), style: const ButtonStyle(
padding: WidgetStatePropertyAll<EdgeInsetsGeometry>(EdgeInsets.zero),
),
onPressed: onPressed, onPressed: onPressed,
child: Text( child: Text(
text, text,
@@ -30,10 +29,10 @@ class CustomTextButton extends StatelessWidget{
fontSize: size, fontSize: size,
fontWeight: weight, fontWeight: weight,
letterSpacing: 0, letterSpacing: 0,
color: color?? Color(0xFF4B4B4B), color: color ?? const Color(0xFF4B4B4B),
decoration: TextDecoration.underline decoration: TextDecoration.underline,
),
), ),
)
); );
} }
} }

32
packages/design_system/lib/src/buttons/primary_button.dart
View File

@@ -1,9 +1,7 @@
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
class PrimaryButton extends StatelessWidget{ class PrimaryButton extends StatelessWidget {
final onPressed; final VoidCallback onPressed;
final String text; final String text;
final Color color; final Color color;
final double height; final double height;
@@ -12,7 +10,8 @@ class PrimaryButton extends StatelessWidget{
final double radius; final double radius;
final double padding; final double padding;
PrimaryButton({ const PrimaryButton({
super.key,
required this.onPressed, required this.onPressed,
required this.text, required this.text,
required this.color, required this.color,
@@ -25,30 +24,35 @@ class PrimaryButton extends StatelessWidget{
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FilledButton( return FilledButton(
style: ButtonStyle( style: ButtonStyle(
backgroundColor: WidgetStatePropertyAll<Color>(color), backgroundColor: WidgetStatePropertyAll<Color>(color),
padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: padding)), padding: WidgetStatePropertyAll<EdgeInsetsGeometry>(
shape: WidgetStatePropertyAll(RoundedRectangleBorder( EdgeInsets.symmetric(horizontal: padding),
),
shape: WidgetStatePropertyAll<OutlinedBorder>(
RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(radius)), borderRadius: BorderRadius.all(Radius.circular(radius)),
)), ),
),
), ),
onPressed: onPressed, onPressed: onPressed,
child: SizedBox( child: SizedBox(
width: width, width: width,
height: height, height: height,
child: Center(child: Text( child: Center(
child: Text(
text, text,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: size, fontSize: size,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
letterSpacing: 0, letterSpacing: 0,
color: Colors.white//theme.getColorFor(ThemeCode.textSecondary) color: Colors.white, // theme.getColorFor(ThemeCode.textSecondary)
) ),
)) ),
) ),
),
); );
} }
} }

39
packages/design_system/lib/src/buttons/secondary_button.dart
View File

@@ -1,10 +1,7 @@
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
class SecondaryButton extends StatelessWidget { class SecondaryButton extends StatelessWidget {
final VoidCallback onPressed;
final onPressed;
final String? text; final String? text;
final IconData? icon; final IconData? icon;
final String? label; final String? label;
@@ -15,8 +12,8 @@ class SecondaryButton extends StatelessWidget {
final double? width; final double? width;
final double? size; final double? size;
@override const SecondaryButton({
SecondaryButton({ super.key,
required this.onPressed, required this.onPressed,
this.text, this.text,
this.icon, this.icon,
@@ -31,20 +28,25 @@ class SecondaryButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OutlinedButton( return OutlinedButton(
style: ButtonStyle( style: ButtonStyle(
padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: padding)), padding: WidgetStatePropertyAll(
shape: WidgetStatePropertyAll(RoundedRectangleBorder( EdgeInsets.symmetric(horizontal: padding),
),
shape: WidgetStatePropertyAll(
RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(radius)), borderRadius: BorderRadius.all(Radius.circular(radius)),
side: BorderSide(color: Color(0xFF4B4B4B)) side: BorderSide(color: Color(0xFF4B4B4B)),
)), ),
),
), ),
onPressed: onPressed, onPressed: onPressed,
child: SizedBox( child: SizedBox(
width: width, width: width,
height: height, height: height,
child: Center(child: text!=null ? Text( child: Center(
child: text != null
? Text(
text!, text!,
textAlign: TextAlign.center, textAlign: TextAlign.center,
semanticsLabel: label, semanticsLabel: label,
@@ -52,16 +54,17 @@ class SecondaryButton extends StatelessWidget {
fontSize: size ?? 18, fontSize: size ?? 18,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
letterSpacing: 0, letterSpacing: 0,
color: Color(0xFF4B4B4B) color: Color(0xFF4B4B4B),
),
) )
) : Icon( : Icon(
icon, icon,
semanticLabel: label, semanticLabel: label,
size: size ?? 24, size: size ?? 24,
color: color ?? Color(0xFF4B4B4B) color: color ?? Color(0xFF4B4B4B),
)) ),
) ),
),
); );
} }
} }

51
packages/design_system/lib/src/dropdowns/dropdown.dart
View File

@@ -1,12 +1,10 @@
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
class CustomDropdown extends StatelessWidget{ class CustomDropdown extends StatelessWidget {
final List<Widget> items; final List<Widget> items;
final values; final List<dynamic>? values;
final onChanged; final ValueChanged<dynamic> onChanged;
final value; final dynamic value;
final String? hint; final String? hint;
final String? label; final String? label;
final double radius; final double radius;
@@ -25,43 +23,54 @@ class CustomDropdown extends StatelessWidget{
this.radius = 12, this.radius = 12,
this.width = double.infinity, this.width = double.infinity,
this.height = 70, this.height = 70,
this.color this.color,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
spacing: 8, spacing: 8,
children: [ children: [
if (label != null) Align( if (label != null)
Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Text( child: Text(
label!, label!,
style: TextStyle(fontSize: 14, letterSpacing: 0), style: const TextStyle(fontSize: 14, letterSpacing: 0),
), ),
), ),
SizedBox( SizedBox(
width: width, width: width,
height: height, height: height,
child: Center(child: DropdownButtonFormField( child: Center(
child: DropdownButtonFormField<dynamic>(
dropdownColor: Colors.white, dropdownColor: Colors.white,
decoration: InputDecoration( decoration: InputDecoration(
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(radius)), borderRadius: BorderRadius.all(Radius.circular(radius)),
borderSide: BorderSide(color: color??Color(0xFF4B4B4B)) borderSide: BorderSide(
) color: color ?? const Color(0xFF4B4B4B),
),
),
), ),
//underline: Container(),
initialValue: value, initialValue: value,
onChanged: onChanged, onChanged: onChanged,
hint: Text(hint??""), hint: hint != null ? Text(hint!) : null,
items: List<DropdownMenuItem>.generate(items.length, (int index){ items: List<DropdownMenuItem<dynamic>>.generate(items.length, (
return DropdownMenuItem(value: (values!=null)?values[index]:index, child: items[index]); int index,
}) ) {
)), final dynamic itemValue = values != null
) ? values![index]
: index;
return DropdownMenuItem<dynamic>(
value: itemValue,
child: items[index],
);
}),
),
),
),
], ],
) ; );
} }
} }

66
packages/design_system/lib/src/inputs/textfields.dart
View File

@@ -1,10 +1,8 @@
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
class CustomTextField extends StatefulWidget{ class CustomTextField extends StatefulWidget {
bool? showPassword; final bool? showPassword;
final bool numeric; final bool numeric;
final String hint; final String hint;
final String label; final String label;
@@ -12,7 +10,7 @@ class CustomTextField extends StatefulWidget{
final ValueChanged<String>? onChanged; final ValueChanged<String>? onChanged;
final int? length; final int? length;
CustomTextField({ const CustomTextField({
super.key, super.key,
this.showPassword, this.showPassword,
this.numeric = false, this.numeric = false,
@@ -27,56 +25,64 @@ class CustomTextField extends StatefulWidget{
State<CustomTextField> createState() => CustomTextFieldState(); State<CustomTextField> createState() => CustomTextFieldState();
} }
class CustomTextFieldState extends State<CustomTextField>{ class CustomTextFieldState extends State<CustomTextField> {
late bool _showPassword;
@override
void initState() {
super.initState();
_showPassword = widget.showPassword ?? true;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
spacing: 8, spacing: 8,
children: [ children: [
?widget.label == '' ? null : Align( if (widget.label.isNotEmpty)
Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Text( child: Text(
widget.label, widget.label,
style: TextStyle(fontSize: 14, letterSpacing: 0), style: const TextStyle(fontSize: 14, letterSpacing: 0),
) ),
), ),
TextFormField( TextFormField(
keyboardType: widget.numeric? TextInputType.number : TextInputType.text, keyboardType: widget.numeric
obscureText: !(widget.showPassword ?? true), ? TextInputType.number
enableSuggestions: widget.showPassword ?? true, : TextInputType.text,
autocorrect: !(widget.showPassword ?? false), obscureText: !_showPassword,
style: TextStyle(color: Color(0xFF4B4B4B)), enableSuggestions: _showPassword,
inputFormatters: widget.numeric? [ autocorrect: !_showPassword,
FilteringTextInputFormatter.digitsOnly style: const TextStyle(color: Color(0xFF4B4B4B)),
] : [], inputFormatters: widget.numeric
? <TextInputFormatter>[FilteringTextInputFormatter.digitsOnly]
: const <TextInputFormatter>[],
decoration: InputDecoration( decoration: InputDecoration(
counterText: "", counterText: "",
hintText: widget.hint, hintText: widget.hint,
//labelText: widget.label, border: const OutlineInputBorder(
//floatingLabelBehavior: FloatingLabelBehavior.always,
border: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(12)), borderRadius: BorderRadius.all(Radius.circular(12)),
borderSide: BorderSide(color: Color(0xFF4B4B4B)), borderSide: BorderSide(color: Color(0xFF4B4B4B)),
gapPadding: 16 gapPadding: 16,
),
suffixIcon: widget.showPassword != null
? IconButton(
icon: Icon(
_showPassword ? Icons.visibility_off : Icons.visibility,
), ),
suffixIcon: widget.showPassword!=null ? IconButton(
icon: Icon(widget.showPassword!
? Icons.visibility_off
: Icons.visibility),
onPressed: () { onPressed: () {
setState(() { setState(() {
widget.showPassword = !widget.showPassword!; _showPassword = !_showPassword;
}); });
}, },
) : null, )
: null,
), ),
minLines: widget.lines ?? 1, minLines: widget.lines ?? 1,
maxLines: widget.lines ?? 1, maxLines: widget.lines ?? 1,
maxLength: widget.length, maxLength: widget.length,
onChanged: widget.onChanged ?? (_)=>{}, onChanged: widget.onChanged,
) ),
], ],
); );
} }

17
packages/design_system/lib/src/progress_bars/progress_bar.dart
View File

@@ -2,7 +2,7 @@ import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
class ProgressBar extends ConsumerWidget{ class ProgressBar extends ConsumerWidget {
final double max; final double max;
final double value; final double value;
final double height; final double height;
@@ -13,6 +13,7 @@ class ProgressBar extends ConsumerWidget{
final Color textColor; final Color textColor;
const ProgressBar({ const ProgressBar({
super.key,
required this.max, required this.max,
required this.value, required this.value,
required this.height, required this.height,
@@ -20,21 +21,19 @@ class ProgressBar extends ConsumerWidget{
required this.textSecondarySize, required this.textSecondarySize,
required this.backgroundColor, required this.backgroundColor,
required this.foregroundColor, required this.foregroundColor,
required this.textColor,} required this.textColor,
); });
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
return Stack(
return
Stack(
children: [ children: [
LinearProgressIndicator( LinearProgressIndicator(
value: value / max, value: value / max,
minHeight: height, minHeight: height,
borderRadius: BorderRadius.all(Radius.circular(24)), borderRadius: BorderRadius.all(Radius.circular(24)),
color: foregroundColor, color: foregroundColor,
backgroundColor: backgroundColor backgroundColor: backgroundColor,
), ),
FractionallySizedBox( FractionallySizedBox(
widthFactor: value / max, widthFactor: value / max,
@@ -47,10 +46,10 @@ class ProgressBar extends ConsumerWidget{
secondarySize: textSecondarySize, secondarySize: textSecondarySize,
color: textColor, color: textColor,
), ),
)
), ),
), ),
] ),
],
); );
} }
} }

29
packages/design_system/lib/src/snackbars/snackbar.dart
View File

@@ -1,32 +1,20 @@
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
enum MessageType { enum MessageType { info, error, warning, success }
info,
error,
warning,
success
}
class CustomSnackBar extends StatelessWidget{ class CustomSnackBar extends StatelessWidget {
final MessageType? type; final MessageType? type;
final String message; final String message;
const CustomSnackBar({ const CustomSnackBar({super.key, this.type, required this.message});
super.key,
this.type,
required this.message,
});
@override @override
SnackBar build(BuildContext context) { SnackBar build(BuildContext context) {
late final Color foregroundColor; late final Color foregroundColor;
late final Color backgroundColor; late final Color backgroundColor;
late final IconData icon; late final IconData icon;
switch (type??MessageType.info){ switch (type ?? MessageType.info) {
case MessageType.info: case MessageType.info:
backgroundColor = Color(0xFFE3EFFD); backgroundColor = Color(0xFFE3EFFD);
foregroundColor = Color(0xFF1F4ECF); foregroundColor = Color(0xFF1F4ECF);
@@ -50,13 +38,18 @@ class CustomSnackBar extends StatelessWidget{
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: BorderSide(color: foregroundColor, width: 1), side: BorderSide(color: foregroundColor, width: 1),
borderRadius: BorderRadius.all(Radius.circular(10)) borderRadius: BorderRadius.all(Radius.circular(10)),
), ),
content: Row( content: Row(
spacing: 8, spacing: 8,
children: [ children: [
Icon(icon, color: foregroundColor), Icon(icon, color: foregroundColor),
Expanded(child: Text(message, style: TextStyle(color: Color(0xFF4B4B4B), fontSize: 14))) Expanded(
child: Text(
message,
style: TextStyle(color: Color(0xFF4B4B4B), fontSize: 14),
),
),
], ],
), ),
); );