Skip to content

Rafa Castillo Passols / Prototipo-Multimedia

Go to a project
Commit 38e38526 by Diego Pérez Peña
Options

Widgets de lista flexibilizados para evitar overflows

parent 86fb3301
Inline Side-by-side
Showing with 188 additions and 129 deletions
lib/modelo/carpeta.dart
......@@ -17,16 +17,20 @@ class Carpeta extends ElementoSeleccionable{
bool get isOpen => _open;
bool get incluyeSubcarpetas => _incluirSubcarpetas;
Carpeta({required super.id, required Directory directory, required Map<Formato, bool> formatos}):
Carpeta({required super.id, required Directory directory}):
_directory = directory,
super(nombre: directory.path.split('/').last, icon: const Icon(Icons.folder_outlined))
{
_formatos = [];
for(var f in formatos.entries) {
_formatos.add(InfoFormato(
formato: f.key,
nombreCarpeta: directory.path.split('/').last,
subCarpeta: f.value));
final archivos = directory.listSync(recursive: true, followLinks: false);
for(var a in archivos) {
Formato? f = Formato.fromExtension(a.path.split(".").last);
if(f != null){
_formatos.add(InfoFormato(
formato: f,
nombreCarpeta: directory.path.split('/').last,
subCarpeta: false));
}
}
}
......
lib/modelo/lista_seleccionables.dart
......@@ -27,9 +27,17 @@ class ListaSeleccionables extends ChangeNotifier {
}
void addCarpeta(Directory directory){
_seleccionables.add(Carpeta(id: const Uuid().v1(),
directory: directory, formatos: <Formato, bool>{Formato.mp4: false, Formato.mp3: true}));
notifyListeners();
final newCarpeta = Carpeta(
id: const Uuid().v1(),
directory: directory
);
if(newCarpeta.formatos.isNotEmpty){
_seleccionables.add(Carpeta(
id: const Uuid().v1(),
directory: directory
));
notifyListeners();
}
}
void reinsertar(int index, ElementoSeleccionable element){
......
lib/paginas/pagina_configuracion.dart
......@@ -31,10 +31,12 @@ class _PaginaConfiguracionState extends State<PaginaConfiguracion> {
return Scaffold(
appBar: AppBar(
title: RichText(
maxLines: 1,
overflow: TextOverflow.ellipsis,
text: TextSpan(
children: [
WidgetSpan(
child: Icon(_getIcon())
child: _getIcon()
),
TextSpan(
text: _getShownName(),
......@@ -49,14 +51,17 @@ class _PaginaConfiguracionState extends State<PaginaConfiguracion> {
);
}
IconData _getIcon(){
Icon _getIcon(){
if(widget._elementoAsociado is Carpeta){
return Icons.folder;
return Icon(Icons.folder);
}
if(widget._elementoAsociado is Enlace){
return Icons.link;
return Icon(Icons.link);
}
return Icons.insert_drive_file;
if(widget._elementoAsociado is Convertible){
return (widget._elementoAsociado as Convertible).formatoOriginal.tipoMultimedia.icono;
}
return Icon(Icons.insert_drive_file);
}
String _getShownName() {
......
lib/widgets/carpeta_widget.dart
......@@ -74,59 +74,76 @@ class _CarpetaWidgetState extends State<CarpetaWidget>
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
widget.carpeta.icono,
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
widget.carpeta.nombre,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
)
),
Text(
(seleccionados.length > 0)?
'${seleccionados.length} formato$s seleccionado$s'
: 'Ningún formato seleccionado',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: (seleccionados.length > 0)? null : Colors.red
)
Flexible(flex:1, child: widget.carpeta.icono),
Flexible(flex: 1, child: const SizedBox(width: 20)),
Flexible(
flex: 15,
child: SizedBox.expand(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Flexible(
flex: 1,
child: Text(
widget.carpeta.nombre,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
),
overflow: TextOverflow.ellipsis,
),
),
Flexible(
flex: 1,
child: Text(
(seleccionados.length > 0)?
'${seleccionados.length} formato$s seleccionado$s'
: 'Ningún formato seleccionado',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: (seleccionados.length > 0)? null : Colors.red
)
),
),
],
)
),
),
Flexible(
flex: 3,
fit: FlexFit.loose,
child: Transform.rotate(
angle: rotAngle,
child: IconButton(
icon: Icon(
Icons.arrow_drop_down,
color: (seleccionados.length > 0)? null : Theme.of(context).disabledColor,
),
],
)
onPressed: (seleccionados.length <= 0)? null : () {
setState(() {
open = !open;
});
widget.carpeta.pressOpenClose();
_controller.toggle();
widget.lista.actualizaSeleccionable(widget.indice, widget.carpeta);
}
),
),
),
Transform.rotate(
angle: rotAngle,
Flexible(
flex: 3,
child: IconButton(
icon: Icon(
Icons.arrow_drop_down,
color: (seleccionados.length > 0)? null : Theme.of(context).disabledColor,
),
onPressed: (seleccionados.length <= 0)? null : () {
setState(() {
open = !open;
});
widget.carpeta.pressOpenClose();
_controller.toggle();
widget.lista.actualizaSeleccionable(widget.indice, widget.carpeta);
}
icon: const Icon(Icons.edit),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return PaginaConfiguracion(
indice: widget.indice,
elemento: widget.carpeta,
lista: widget.lista
);
}));
},
),
),
IconButton(
icon: const Icon(Icons.edit),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return PaginaConfiguracion(
indice: widget.indice,
elemento: widget.carpeta,
lista: widget.lista
);
}));
},
)
]
),
......@@ -174,7 +191,7 @@ class _CarpetaWidgetState extends State<CarpetaWidget>
widget.lista.actualizaSeleccionable(widget.indice, widget.carpeta);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('${elemento.formatoOriginal.name.toUpperCase()} excluido de ${widget.carpeta}'),
content: Text('${elemento.formatoOriginal.name.toUpperCase()} excluido de ${widget.carpeta.nombre}'),
action: SnackBarAction(
label: 'Deshacer',
onPressed: () {
......@@ -194,42 +211,55 @@ class _CarpetaWidgetState extends State<CarpetaWidget>
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Icon(Icons.find_in_page_outlined),
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
widget.carpeta.nombre,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
)
),
Text(
texto,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
)
),
],
)
Flexible(flex: 1, child: Icon(Icons.find_in_page_outlined)),
Flexible(flex: 1, child: const SizedBox(width: 10)),
Flexible(
flex: 13,
child: SizedBox.expand(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Flexible(
flex: 1,
child: Text(
widget.carpeta.nombre,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
),
overflow: TextOverflow.ellipsis
),
),
Flexible(
flex: 1,
child: Text(
texto,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
)
),
),
],
)
),
),
IconButton(
icon: const Icon(Icons.edit),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return PaginaConfiguracion(
indice: widget.indice,
elemento: elemento.conversion,
lista: widget.lista,
carpeta: widget.carpeta
);
}
));
},
Flexible(
flex: 2,
child: IconButton(
icon: const Icon(Icons.edit),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return PaginaConfiguracion(
indice: widget.indice,
elemento: elemento.conversion,
lista: widget.lista,
carpeta: widget.carpeta
);
}
));
},
),
)
]
),
......
lib/widgets/convertex_fab_bar.dart
......@@ -150,7 +150,6 @@ class _ConVertexFabBarState extends State<ConVertexFabBar> {
onPressed: () async {
String? path = await FilePicker.platform.getDirectoryPath();
if (path != null) {
// TODO: AÑADIR POSIBILIDAD RECURSIVIDAD
var directory = Directory(path);
manager.addCarpeta(directory);
}
......
lib/widgets/seleccionable_widget.dart
......@@ -28,37 +28,50 @@ class SeleccionableWidget extends StatelessWidget {
Convertible arch = (seleccionable as Convertible);
String texto = arch.formatoOriginal.name.toUpperCase();
if(arch.formatoDestino != null) texto += " > ${arch.formatoDestino!.name.toUpperCase()}";
formatoOrig = Text(texto);
formatoOrig = Flexible(flex:1, child: Text(texto));
}
return Row(
children: <Widget>[
seleccionable.icono,
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
visible,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
)
),
if(formatoOrig != null) formatoOrig
],
)
),
IconButton(
icon: const Icon(Icons.edit),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return PaginaConfiguracion(indice: indice, elemento: seleccionable, lista: lista);
}));
},
)
]
return SizedBox(
height: 60,
width: MediaQuery.of(context).size.width,
child: Row(
children: <Widget>[
Flexible(flex: 1, child: seleccionable.icono),
Flexible(flex: 1, child: const SizedBox(width: 15)),
Flexible(
flex: 16,
child: SizedBox.expand(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
flex: 1,
child: Text(
visible,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.bold
)
),
),
if(formatoOrig != null) formatoOrig
],
)
),
),
Flexible(
flex: 2,
child: IconButton(
icon: const Icon(Icons.edit),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return PaginaConfiguracion(indice: indice, elemento: seleccionable, lista: lista);
}));
},
),
)
]
)
);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment