johrpan/musicus_mobile
1
0
Fork 0
mirror of https://github.com/johrpan/musicus_mobile.git synced 2025-10-26 10:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mobile: Use new API on selection screens

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

45
mobile/lib/screens/home.dart
View file

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

59
mobile/lib/screens/person.dart
View file

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

35
mobile/lib/screens/work.dart
View file

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