mobile: Use new API on selection screens

This commit is contained in:
Elias Projahn 2020-05-03 23:01:16 +02:00
parent 7bf99ebd07
commit 52a2d5c3ec
3 changed files with 88 additions and 85 deletions

View file

@ -3,18 +3,36 @@ import 'package:musicus_database/musicus_database.dart';
import '../backend.dart'; import '../backend.dart';
import '../editors/tracks.dart'; import '../editors/tracks.dart';
import '../widgets/lists.dart';
import 'person.dart'; import 'person.dart';
import 'settings.dart'; import 'settings.dart';
class HomeScreen extends StatelessWidget { class HomeScreen extends StatefulWidget {
@override
_HomeScreenState createState() => _HomeScreenState();
}
class _HomeScreenState extends State<HomeScreen> {
String _search;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final backend = Backend.of(context); final backend = Backend.of(context);
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Musicus'), title: TextField(
autofocus: true,
onChanged: (text) {
setState(() {
_search = text;
});
},
decoration: InputDecoration.collapsed(
hintText: 'Composers',
),
),
actions: <Widget>[ actions: <Widget>[
PopupMenuButton( PopupMenuButton(
icon: const Icon(Icons.more_vert), icon: const Icon(Icons.more_vert),
@ -49,15 +67,12 @@ class HomeScreen extends StatelessWidget {
), ),
], ],
), ),
body: FutureBuilder<List<Person>>( body: PagedListView<Person>(
future: backend.db.getPersons(), search: _search,
builder: (context, snapshot) { fetch: (page, search) async {
if (snapshot.hasData) { return await backend.db.getPersons(page, search);
return ListView.builder( },
itemCount: snapshot.data.length, builder: (context, person) => ListTile(
itemBuilder: (context, index) {
final person = snapshot.data[index];
return ListTile(
title: Text('${person.lastName}, ${person.firstName}'), title: Text('${person.lastName}, ${person.firstName}'),
onTap: () => Navigator.push( onTap: () => Navigator.push(
context, context,
@ -67,13 +82,7 @@ class HomeScreen extends StatelessWidget {
), ),
), ),
), ),
); ),
},
);
} else {
return Container();
}
},
), ),
); );
} }

View file

@ -3,23 +3,42 @@ import 'package:musicus_database/musicus_database.dart';
import '../backend.dart'; import '../backend.dart';
import '../editors/person.dart'; import '../editors/person.dart';
import '../widgets/lists.dart';
import 'work.dart'; import 'work.dart';
class PersonScreen extends StatelessWidget { class PersonScreen extends StatefulWidget {
final Person person; final Person person;
PersonScreen({ PersonScreen({
this.person, this.person,
}); });
@override
_PersonScreenState createState() => _PersonScreenState();
}
class _PersonScreenState extends State<PersonScreen> {
String _search;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final backend = Backend.of(context); final backend = Backend.of(context);
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('${person.firstName} ${person.lastName}'), title: TextField(
autofocus: true,
onChanged: (text) {
setState(() {
_search = text;
});
},
decoration: InputDecoration.collapsed(
hintText:
'Works by ${widget.person.firstName} ${widget.person.lastName}',
),
),
actions: <Widget>[ actions: <Widget>[
IconButton( IconButton(
icon: const Icon(Icons.edit), icon: const Icon(Icons.edit),
@ -28,7 +47,7 @@ class PersonScreen extends StatelessWidget {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PersonEditor( builder: (context) => PersonEditor(
person: person, person: widget.person,
), ),
fullscreenDialog: true, fullscreenDialog: true,
), ),
@ -37,36 +56,22 @@ class PersonScreen extends StatelessWidget {
), ),
], ],
), ),
body: FutureBuilder<List<WorkInfo>>( body: PagedListView<WorkInfo>(
future: backend.db.getWorks(person.id), search: _search,
builder: (context, snapshot) { fetch: (page, search) async {
if (snapshot.hasData) { return await backend.db.getWorks(widget.person.id, page, search);
return ListView.builder( },
itemCount: snapshot.data.length, builder: (context, workInfo) => ListTile(
itemBuilder: (context, index) { title: Text(workInfo.work.title),
final work = snapshot.data[index].work; onTap: () => Navigator.push(
return ListTile(
title: Text(work.title),
onTap: () async {
final workInfo = await backend.db.getWorkInfo(work);
Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => WorkScreen( builder: (context) => WorkScreen(
workInfo: workInfo, workInfo: workInfo,
), ),
), ),
); ),
}, ),
);
},
);
} else {
return Container();
}
},
), ),
); );
} }

View file

@ -4,6 +4,7 @@ import 'package:musicus_database/musicus_database.dart';
import '../backend.dart'; import '../backend.dart';
import '../editors/work.dart'; import '../editors/work.dart';
import '../widgets/texts.dart'; import '../widgets/texts.dart';
import '../widgets/lists.dart';
class WorkScreen extends StatelessWidget { class WorkScreen extends StatelessWidget {
final WorkInfo workInfo; final WorkInfo workInfo;
@ -36,35 +37,23 @@ class WorkScreen extends StatelessWidget {
), ),
], ],
), ),
body: FutureBuilder<List<RecordingInfo>>( body: PagedListView<RecordingInfo>(
future: backend.db.getRecordings(workInfo.work.id), fetch: (page, _) async {
builder: (context, snapshot) { return await backend.client.getRecordings(workInfo.work.id, page);
if (snapshot.hasData) { },
return ListView.builder( builder: (context, recordingInfo) => ListTile(
itemCount: snapshot.data.length,
itemBuilder: (context, index) {
final recordingInfo = snapshot.data[index];
final recording = recordingInfo.recording;
return ListTile(
title: PerformancesText( title: PerformancesText(
performanceInfos: recordingInfo.performances, performanceInfos: recordingInfo.performances,
), ),
onTap: () async { onTap: () {
final tracks = backend.ml.tracks[recording.id]; final tracks = backend.ml.tracks[recordingInfo.recording.id];
tracks.sort( tracks.sort((t1, t2) => t1.track.index.compareTo(t2.track.index));
(t1, t2) => t1.track.index.compareTo(t2.track.index));
backend.player.addTracks(backend.ml.tracks[recording.id]); backend.player
}, .addTracks(backend.ml.tracks[recordingInfo.recording.id]);
);
},
);
} else {
return Container();
}
}, },
), ),
),
); );
} }
} }