comunes/comunes-flutter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: linting de widgets de layout y utilidades

Browse source 
Ajustes de estilo/linting en los helpers centered* de layout,
appIntroPage, roundedButton, secretLoader y utils (refactor pendiente).
This commit is contained in:
vjrj 2026-07-12 23:26:43 +02:00
parent 9b0fe987f8
commit 51fe8c6431
15 changed files with 141 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

79
lib/appIntroPage.dart
View file

@ -11,7 +11,7 @@ class AppIntroItem {
final String title;
final String subTitle;
AppIntroItem({this.icon, this.title, this.subTitle = ''});
AppIntroItem({required this.icon, required this.title, this.subTitle = ''});
// 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem. Morbi aliquam turpis rhoncus sapien volutpat condimentum.'});
}
@ -23,83 +23,86 @@ abstract class AppIntroPage extends StatelessWidget {
final ListItems items;
final OnIntroFinish onIntroFinish;
const AppIntroPage({Key key, this.items, this.onIntroFinish})
const AppIntroPage(
{Key? key, required this.items, required this.onIntroFinish})
: super(key: key);
@override
Widget build(BuildContext context) {
return new Scaffold(
// appBar: new AppBar(),
body: new DefaultTabController(
return Scaffold(
// appBar: AppBar(),
body: DefaultTabController(
length: items(context).length,
child: new _AppIntroPageSelector(items: items, onFinish: onIntroFinish),
child: _AppIntroPageSelector(items: items, onFinish: onIntroFinish),
),
);
}
}
class _AppIntroPageSelector extends StatelessWidget {
const _AppIntroPageSelector({this.items, this.onFinish});
const _AppIntroPageSelector({required this.items, required this.onFinish});
final ListItems items;
final OnIntroFinish onFinish;
void _handleArrowButtonPress(BuildContext context, int delta) {
final TabController controller = DefaultTabController.of(context);
final TabController controller = DefaultTabController.of(context)!;
if (!controller.indexIsChanging)
controller
.animateTo((controller.index + delta).clamp(0, items(context).length - 1));
controller.animateTo(
(controller.index + delta).clamp(0, items(context).length - 1));
}
@override
Widget build(BuildContext context) {
final TabController controller = DefaultTabController.of(context);
final TabController controller = DefaultTabController.of(context)!;
final ThemeData theme = Theme.of(context);
final Color color = theme.accentColor;
final Color color = theme.colorScheme.secondary;
final TextStyle titleStyle =
theme.textTheme.headline.copyWith(color: color);
(theme.textTheme.headlineSmall ?? const TextStyle())
.copyWith(color: color);
final TextStyle subTitleStyle =
theme.textTheme.subhead; //.copyWith(color: color);
theme.textTheme.titleMedium ?? const TextStyle();
// final TextStyle descriptionStyle = theme.textTheme.subhead;
return new SafeArea(
return SafeArea(
top: true,
bottom: false,
child: new Column(
child: Column(
children: <Widget>[
new Row(mainAxisAlignment: MainAxisAlignment.end, children: <Widget>[
new IconButton(
Row(mainAxisAlignment: MainAxisAlignment.end, children: <Widget>[
IconButton(
onPressed: () {
onFinish(context);
},
icon: new Icon(Icons.close, size: 30.0, color: Colors.black38)),
icon:
const Icon(Icons.close, size: 30.0, color: Colors.black38)),
]),
new Expanded(
child: new OrientationBuilder(builder: (context, orientation) {
return new IconTheme(
data: new IconThemeData(
Expanded(child: OrientationBuilder(builder: (context, orientation) {
return IconTheme(
data: IconThemeData(
size: orientation == Orientation.portrait ? 200.0 : 100.0,
color: color,
),
child: new TabBarView(
child: TabBarView(
children: items(context).map((AppIntroItem item) {
return new Container(
return Container(
padding: const EdgeInsets.all(12.0),
child: new Center(
child: new CenteredSpaceEvenlyColumn(children: <Widget>[
child: Center(
child: CenteredSpaceEvenlyColumn(children: <Widget>[
Icon(
item.icon,
semanticLabel: item.title,
),
new Padding(
padding: new EdgeInsets.only(left: 16.0, right: 16.0),
child: new CenteredColumn(children: <Widget>[
new Text(
Padding(
padding:
const EdgeInsets.only(left: 16.0, right: 16.0),
child: CenteredColumn(children: <Widget>[
Text(
item.title,
style: titleStyle,
textAlign: TextAlign.center,
),
new SizedBox(height: 20.0),
new Text(
const SizedBox(height: 20.0),
Text(
item.subTitle,
style: subTitleStyle,
textAlign: TextAlign.center,
@ -111,19 +114,19 @@ class _AppIntroPageSelector extends StatelessWidget {
}).toList()),
);
})),
new Container(
Container(
margin: const EdgeInsets.only(top: 16.0),
child: new Row(
child: Row(
children: listWithoutNulls(<Widget>[
new IconButton(
IconButton(
icon: const Icon(Icons.chevron_left),
color: color,
onPressed: () {
_handleArrowButtonPress(context, -1);
},
tooltip: 'Page back'),
new TabPageSelector(controller: controller),
new IconButton(
TabPageSelector(controller: controller),
IconButton(
icon: const Icon(Icons.chevron_right),
color: color,
onPressed: () {

12
lib/layout/abstractCenteredColumn.dart
View file

@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
abstract class AbstractCenteredColumn extends Column {
AbstractCenteredColumn({
Key key,
MainAxisAlignment mainAxisAlignment,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
MainAxisAlignment? mainAxisAlignment,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,
mainAxisAlignment: mainAxisAlignment,
mainAxisAlignment: mainAxisAlignment ?? MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.center,
textDirection: textDirection,

10
lib/layout/abstractCenteredRow.dart
View file

@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
abstract class AbstractCenteredRow extends Row {
AbstractCenteredRow({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
mainAxisAlignment,
List<Widget> children: const <Widget>[],
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,
mainAxisAlignment: mainAxisAlignment,
mainAxisAlignment: mainAxisAlignment ?? MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.center,
textDirection: textDirection,

8
lib/layout/centeredColumn.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredColumn.dart';
class CenteredColumn extends AbstractCenteredColumn {
CenteredColumn({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredMaxWidget.dart
View file

@ -4,10 +4,10 @@ import 'centeredRow.dart';
class CenteredMaxWidget extends CenteredColumn {
CenteredMaxWidget({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: <Widget>[new CenteredRow(children: children)],
key: key,

8
lib/layout/centeredRow.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredRow.dart';
class CenteredRow extends AbstractCenteredRow {
CenteredRow({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredSpaceAroundColumn.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredColumn.dart';
class CenteredSpaceAroundColumn extends AbstractCenteredColumn {
CenteredSpaceAroundColumn({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredSpaceAroundRow.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredRow.dart';
class CenteredSpacedAroundRow extends AbstractCenteredRow {
CenteredSpacedAroundRow({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredSpaceBetweenColumn.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredColumn.dart';
class CenteredSpaceBetweenColumn extends AbstractCenteredColumn {
CenteredSpaceBetweenColumn({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredSpaceBetweenRow.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredRow.dart';
class CenteredSpacedBetweenRow extends AbstractCenteredRow {
CenteredSpacedBetweenRow({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredSpaceEvenlyColumn.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredColumn.dart';
class CenteredSpaceEvenlyColumn extends AbstractCenteredColumn {
CenteredSpaceEvenlyColumn({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

8
lib/layout/centeredSpaceEvenlyRow.dart
View file

@ -3,10 +3,10 @@ import 'abstractCenteredRow.dart';
class CenteredSpacedEvenlyRow extends AbstractCenteredRow {
CenteredSpacedEvenlyRow({
Key key,
TextDirection textDirection,
TextBaseline textBaseline,
List<Widget> children: const <Widget>[],
Key? key,
TextDirection? textDirection,
TextBaseline? textBaseline,
List<Widget> children = const <Widget>[],
}) : super(
children: children,
key: key,

6
lib/utils/secretLoader.dart
View file

@ -5,13 +5,13 @@ import 'package:flutter/services.dart' show rootBundle;
class SecretLoader {
final String secretPath;
SecretLoader({this.secretPath});
SecretLoader({required this.secretPath});
Future<Map<String, dynamic>> load() {
rootBundle.loadString(secretPath, cache: false);
return rootBundle.loadStructuredData<Map<String, dynamic>>(this.secretPath,
return rootBundle.loadStructuredData<Map<String, dynamic>>(secretPath,
(jsonStr) async {
return json.decode(jsonStr);
});
}
}
}

2
lib/utils/utils.dart
View file

@ -8,4 +8,4 @@ bool notNull(Object o) => o != null;
List<Widget> listWithoutNulls(List<Widget> children) =>
children.where(notNull).toList();
ellipse(String s,[ int end = 4]) => s != null ? s.substring(0, end) + '...' : null;
ellipse(String s,[ int end = 4]) => s.substring(0, end) + '...';

86
lib/widgets/roundedButton.dart
View file

@ -1,56 +1,68 @@
import 'package:flutter/material.dart';
class RoundedBtn extends StatelessWidget {
final btnRadius = new Radius.circular(90.0);
static const btnRadius = Radius.circular(90.0);
final IconData icon;
final String text;
final Color backColor;
final Color fontColor;
final TextStyle textStyle;
VoidCallback onPressed;
final VoidCallback onPressed;
RoundedBtn(
{@required this.icon,
@required this.text,
@required this.onPressed,
@required this.backColor,
this.textStyle = const TextStyle(fontSize: 20.0, color: Colors.white),
this.fontColor = Colors.white});
const RoundedBtn({
required this.icon,
required this.text,
required this.onPressed,
required this.backColor,
this.textStyle = const TextStyle(fontSize: 20.0, color: Colors.white),
this.fontColor = Colors.white,
});
RoundedBtn.nav(
{@required this.icon,
@required this.text,
@required BuildContext context,
@required route,
@required this.backColor,
this.textStyle = const TextStyle(fontSize: 20.0, color: Colors.white),
this.fontColor = Colors.white}) {
this.onPressed = () {
Navigator.pushNamed(context, route);
};
factory RoundedBtn.nav({
required IconData icon,
required String text,
required BuildContext context,
required String route,
required Color backColor,
TextStyle textStyle = const TextStyle(fontSize: 20.0, color: Colors.white),
Color fontColor = Colors.white,
}) {
return RoundedBtn(
icon: icon,
text: text,
onPressed: () {
Navigator.pushNamed(context, route);
},
backColor: backColor,
textStyle: textStyle,
fontColor: fontColor,
);
}
@override
Widget build(BuildContext context) {
return new SizedBox(
child: new RaisedButton(
elevation: 1.0,
color: backColor,
child: new Padding(
padding: const EdgeInsets.all(10.0),
child: new Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
new Icon(icon, size: 32.0, color: fontColor),
new SizedBox(width: 10.0),
new Text(text, style: textStyle),
],
),
return SizedBox(
child: ElevatedButton(
onPressed: onPressed,
style: ElevatedButton.styleFrom(
backgroundColor: backColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(btnRadius),
),
onPressed: onPressed,
shape: new RoundedRectangleBorder(
borderRadius: BorderRadius.all(btnRadius))),
),
child: Padding(
padding: const EdgeInsets.all(10.0),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Icon(icon, size: 32.0, color: fontColor),
const SizedBox(width: 10.0),
Text(text, style: textStyle),
],
),
),
),
);
}
}