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

Move more code from mobile to common

Browse source
This commit is contained in:
Elias Projahn 2020-07-18 11:54:49 +02:00
parent 2e4f69a178
commit 5312bad52d
28 changed files with 258 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

0
mobile/assets/about.md → common/assets/about.md
View file

0
mobile/fonts/libertinussans_bold.otf → common/fonts/libertinussans_bold.otf
View file

0
mobile/fonts/libertinussans_italic.otf → common/fonts/libertinussans_italic.otf
View file

0
mobile/fonts/libertinussans_regular.otf → common/fonts/libertinussans_regular.otf
View file

0
mobile/fonts/musicus_icons.ttf → common/fonts/musicus_icons.ttf
View file

21
common/lib/musicus_common.dart
View file

@ -1,23 +1,4 @@
export 'src/editors/ensemble.dart';
export 'src/editors/instrument.dart';
export 'src/editors/performance.dart';
export 'src/editors/person.dart';
export 'src/editors/recording.dart';
export 'src/editors/tracks.dart';
export 'src/editors/work.dart';
export 'src/selectors/ensemble.dart';
export 'src/selectors/files.dart';
export 'src/selectors/instruments.dart';
export 'src/selectors/person.dart';
export 'src/selectors/recording.dart';
export 'src/selectors/work.dart';
export 'src/widgets/lists.dart';
export 'src/widgets/recording_tile.dart';
export 'src/widgets/texts.dart';
export 'src/backend.dart';
export 'src/app.dart';
export 'src/library.dart';
export 'src/platform.dart';
export 'src/playback.dart';

188
common/lib/src/app.dart Normal file
View file

@ -0,0 +1,188 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'backend.dart';
import 'screens/home.dart';
import 'settings.dart';
import 'platform.dart';
import 'playback.dart';
import 'widgets/player_bar.dart';
/// The classical music player and organizer.
///
/// This widget is the cross platform abstraction for a whole Musicus app. The
/// properties should be implemented seperately for each platform.
class MusicusApp extends StatelessWidget {
/// Path to the database file.
final String dbPath;
/// An object to persist the settings.
final MusicusSettingsStorage settingsStorage;
/// An object handling playback.
final MusicusPlayback playback;
/// An object handling platform dependent functionality.
final MusicusPlatform platform;
MusicusApp({
@required this.dbPath,
@required this.settingsStorage,
@required this.playback,
@required this.platform,
});
@override
Widget build(BuildContext context) {
return MusicusBackend(
dbPath: dbPath,
settingsStorage: settingsStorage,
playback: playback,
platform: platform,
child: Builder(
builder: (context) {
final backend = MusicusBackend.of(context);
return MaterialApp(
title: 'Musicus',
theme: ThemeData(
brightness: Brightness.dark,
accentColor: Colors.amber,
textSelectionColor: Colors.grey[600],
cursorColor: Colors.amber,
textSelectionHandleColor: Colors.amber,
toggleableActiveColor: Colors.amber,
// Added for sliders and FABs. Not everything seems to obey this.
colorScheme: ColorScheme.dark(
primary: Colors.amber,
secondary: Colors.amber,
),
snackBarTheme: SnackBarThemeData(
backgroundColor: Colors.grey[800],
contentTextStyle: TextStyle(
color: Colors.white,
),
behavior: SnackBarBehavior.floating,
),
fontFamily: 'Libertinus Sans',
),
home: Builder(
builder: (context) {
if (backend.status == MusicusBackendStatus.loading) {
return Material(
color: Theme.of(context).scaffoldBackgroundColor,
);
} else if (backend.status == MusicusBackendStatus.setup) {
return Material(
color: Theme.of(context).scaffoldBackgroundColor,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
'Choose the base path for\nyour music library.',
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headline6,
),
SizedBox(
height: 16.0,
),
ListTile(
leading: const Icon(Icons.folder_open),
title: Text('Choose path'),
onTap: () async {
final uri = await platform.chooseBasePath();
if (uri != null) {
backend.settings.setMusicLibraryPath(uri);
}
},
),
],
),
);
} else {
return Content();
}
},
),
);
},
),
);
}
}
class Content extends StatefulWidget {
@override
_ContentState createState() => _ContentState();
}
class _ContentState extends State<Content> with SingleTickerProviderStateMixin {
final nestedNavigator = GlobalKey<NavigatorState>();
AnimationController playerBarAnimation;
MusicusBackendState backend;
StreamSubscription<bool> playerActiveSubscription;
@override
void initState() {
super.initState();
playerBarAnimation = AnimationController(
vsync: this,
duration: Duration(milliseconds: 300),
);
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
backend = MusicusBackend.of(context);
playerBarAnimation.value = backend.playback.active.value ? 1.0 : 0.0;
if (playerActiveSubscription != null) {
playerActiveSubscription.cancel();
}
playerActiveSubscription = backend.playback.active.listen((active) =>
active ? playerBarAnimation.forward() : playerBarAnimation.reverse());
}
@override
Widget build(BuildContext context) {
// The nested Navigator is for every screen from which the player bar at
// the bottom should be accessible. The WillPopScope widget intercepts
// taps on the system back button and redirects them to the nested
// navigator.
return WillPopScope(
onWillPop: () async => !(await nestedNavigator.currentState.maybePop()),
child: Scaffold(
body: Navigator(
key: nestedNavigator,
onGenerateRoute: (settings) => settings.name == '/'
? MaterialPageRoute(
builder: (context) => HomeScreen(),
)
: null,
initialRoute: '/',
),
bottomNavigationBar: SizeTransition(
sizeFactor: CurvedAnimation(
curve: Curves.easeOut,
parent: playerBarAnimation,
),
axisAlignment: -1.0,
child: PlayerBar(),
),
),
);
}
@override
void dispose() {
super.dispose();
playerActiveSubscription.cancel();
}
}

2
mobile/lib/icons.dart → common/lib/src/icons.dart
View file

@ -7,7 +7,7 @@ class MusicusIcons {
MusicusIcons._();
static const _kFontFam = 'Musicus Icons';
static const _kFontPkg = null;
static const _kFontPkg = 'musicus_common';
static const IconData musicus =
IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);

6
common/lib/src/platform.dart
View file

@ -46,6 +46,12 @@ abstract class MusicusPlatform {
basePath = path;
}
/// Choose a root level directory for the music library.
///
/// This should return a string representation of the chosen directory
/// suitable for storage as [basePath].
Future<String> chooseBasePath();
/// Get all documents in a directory.
///
/// [parentId] will be the ID of the directory document. If [parentId] is

3
mobile/lib/screens/about.dart → common/lib/src/screens/about.dart
View file

@ -14,7 +14,8 @@ class AboutScreen extends StatelessWidget {
title: Text('About'),
),
body: FutureBuilder<String>(
future: rootBundle.loadString('assets/about.md'),
future:
rootBundle.loadString('packages/musicus_common/assets/about.md'),
builder: (context, snapshot) {
if (snapshot.hasData) {
return Markdown(

3
mobile/lib/screens/account_settings.dart → common/lib/src/screens/account_settings.dart
View file

@ -2,7 +2,8 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import 'delete_account.dart';
import 'email.dart';

3
mobile/lib/screens/delete_account.dart → common/lib/src/screens/delete_account.dart
View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
class DeleteAccountScreen extends StatefulWidget {
@override

3
mobile/lib/screens/email.dart → common/lib/src/screens/email.dart
View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
class EmailScreen extends StatefulWidget {
final String email;

5
mobile/lib/screens/home.dart → common/lib/src/screens/home.dart
View file

@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import '../editors/person.dart';
import '../editors/tracks.dart';
import '../icons.dart';
import '../widgets/lists.dart';
import 'about.dart';
import 'person.dart';

3
mobile/lib/screens/password.dart → common/lib/src/screens/password.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
class PasswordScreen extends StatefulWidget {
@override

5
mobile/lib/screens/person.dart → common/lib/src/screens/person.dart
View file

@ -1,6 +1,9 @@
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import '../editors/work.dart';
import '../widgets/lists.dart';
import 'work.dart';

4
mobile/lib/screens/program.dart → common/lib/src/screens/program.dart
View file

@ -2,9 +2,11 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import '../library.dart';
import '../widgets/play_pause_button.dart';
import '../widgets/recording_tile.dart';
class ProgramScreen extends StatefulWidget {
@override

3
mobile/lib/screens/register.dart → common/lib/src/screens/register.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
/// A screen for creating a new Musicus account.
class RegisterScreen extends StatefulWidget {

2
mobile/lib/screens/server_settings.dart → common/lib/src/screens/server_settings.dart
View file

@ -3,6 +3,8 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
class ServerSettingsScreen extends StatefulWidget {
@override
_ServerSettingsScreenState createState() => _ServerSettingsScreenState();

4
mobile/lib/screens/settings.dart → common/lib/src/screens/settings.dart
View file

@ -3,6 +3,8 @@ import 'package:flutter/services.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import 'account_settings.dart';
import 'server_settings.dart';
@ -28,7 +30,7 @@ class SettingsScreen extends StatelessWidget {
subtitle: Text(snapshot.data ?? 'Choose folder'),
isThreeLine: snapshot.hasData,
onTap: () async {
final uri = await _platform.invokeMethod<String>('openTree');
final uri = await backend.platform.chooseBasePath();
if (uri != null) {
settings.setMusicLibraryPath(uri);

6
mobile/lib/screens/work.dart → common/lib/src/screens/work.dart
View file

@ -1,6 +1,10 @@
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import '../editors/recording.dart';
import '../widgets/lists.dart';
import '../widgets/texts.dart';
class WorkScreen extends StatelessWidget {
final WorkInfo workInfo;

3
mobile/lib/widgets/play_pause_button.dart → common/lib/src/widgets/play_pause_button.dart
View file

@ -1,7 +1,8 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
class PlayPauseButton extends StatefulWidget {
@override

3
mobile/lib/widgets/player_bar.dart → common/lib/src/widgets/player_bar.dart
View file

@ -2,8 +2,9 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_common/musicus_common.dart';
import '../backend.dart';
import '../library.dart';
import '../screens/program.dart';
import 'play_pause_button.dart';

20
common/pubspec.yaml
View file

@ -8,9 +8,27 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_markdown:
meta:
moor:
moor_ffi:
musicus_client:
path: ../client
rxdart:
rxdart:
url_launcher:
flutter:
uses-material-design: true
assets:
- assets/about.md
fonts:
- family: Libertinus Sans
fonts:
- asset: fonts/libertinussans_regular.otf
- asset: fonts/libertinussans_bold.otf
weight: 700
- asset: fonts/libertinussans_italic.otf
style: italic
- family: Musicus Icons
fonts:
- asset: fonts/musicus_icons.ttf

156
mobile/lib/app.dart
View file

@ -1,156 +0,0 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:musicus_common/musicus_common.dart';
import 'screens/home.dart';
import 'widgets/player_bar.dart';
class App extends StatelessWidget {
static const _platform = MethodChannel('de.johrpan.musicus/platform');
@override
Widget build(BuildContext context) {
final backend = MusicusBackend.of(context);
return MaterialApp(
title: 'Musicus',
theme: ThemeData(
brightness: Brightness.dark,
accentColor: Colors.amber,
textSelectionColor: Colors.grey[600],
cursorColor: Colors.amber,
textSelectionHandleColor: Colors.amber,
toggleableActiveColor: Colors.amber,
// Added for sliders and FABs. Not everything seems to obey this.
colorScheme: ColorScheme.dark(
primary: Colors.amber,
secondary: Colors.amber,
),
snackBarTheme: SnackBarThemeData(
backgroundColor: Colors.grey[800],
contentTextStyle: TextStyle(
color: Colors.white,
),
behavior: SnackBarBehavior.floating,
),
fontFamily: 'Libertinus Sans',
),
home: Builder(
builder: (context) {
if (backend.status == MusicusBackendStatus.loading) {
return Material(
color: Theme.of(context).scaffoldBackgroundColor,
);
} else if (backend.status == MusicusBackendStatus.setup) {
return Material(
color: Theme.of(context).scaffoldBackgroundColor,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
'Choose the base path for\nyour music library.',
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headline6,
),
SizedBox(
height: 16.0,
),
ListTile(
leading: const Icon(Icons.folder_open),
title: Text('Choose path'),
onTap: () async {
final uri =
await _platform.invokeMethod<String>('openTree');
if (uri != null) {
backend.settings.setMusicLibraryPath(uri);
}
},
),
],
),
);
} else {
return Content();
}
},
),
);
}
}
class Content extends StatefulWidget {
@override
_ContentState createState() => _ContentState();
}
class _ContentState extends State<Content> with SingleTickerProviderStateMixin {
final nestedNavigator = GlobalKey<NavigatorState>();
AnimationController playerBarAnimation;
MusicusBackendState backend;
StreamSubscription<bool> playerActiveSubscription;
@override
void initState() {
super.initState();
playerBarAnimation = AnimationController(
vsync: this,
duration: Duration(milliseconds: 300),
);
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
backend = MusicusBackend.of(context);
playerBarAnimation.value = backend.playback.active.value ? 1.0 : 0.0;
if (playerActiveSubscription != null) {
playerActiveSubscription.cancel();
}
playerActiveSubscription = backend.playback.active.listen((active) =>
active ? playerBarAnimation.forward() : playerBarAnimation.reverse());
}
@override
Widget build(BuildContext context) {
// The nested Navigator is for every screen from which the player bar at
// the bottom should be accessible. The WillPopScope widget intercepts
// taps on the system back button and redirects them to the nested
// navigator.
return WillPopScope(
onWillPop: () async => !(await nestedNavigator.currentState.maybePop()),
child: Scaffold(
body: Navigator(
key: nestedNavigator,
onGenerateRoute: (settings) => settings.name == '/'
? MaterialPageRoute(
builder: (context) => HomeScreen(),
)
: null,
initialRoute: '/',
),
bottomNavigationBar: SizeTransition(
sizeFactor: CurvedAnimation(
curve: Curves.easeOut,
parent: playerBarAnimation,
),
axisAlignment: -1.0,
child: PlayerBar(),
),
),
);
}
@override
void dispose() {
super.dispose();
playerActiveSubscription.cancel();
}
}

4
mobile/lib/main.dart
View file

@ -4,7 +4,6 @@ import 'package:musicus_common/musicus_common.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart' as pp;
import 'app.dart';
import 'settings.dart';
import 'platform.dart';
import 'playback.dart';
@ -16,12 +15,11 @@ Future<void> main() async {
final dbPath = p.join(dir.path, 'db.sqlite');
runApp(AudioServiceWidget(
child: MusicusBackend(
child: MusicusApp(
dbPath: dbPath,
settingsStorage: SettingsStorage(),
platform: MusicusAndroidPlatform(),
playback: Playback(),
child: App(),
),
));
}

5
mobile/lib/platform.dart
View file

@ -4,6 +4,11 @@ import 'package:musicus_common/musicus_common.dart';
class MusicusAndroidPlatform extends MusicusPlatform {
static const _platform = MethodChannel('de.johrpan.musicus/platform');
@override
Future<String> chooseBasePath() async {
return await _platform.invokeMethod<String>('openTree');
}
@override
Future<List<Document>> getChildren(String parentId) async {
final List<Map<dynamic, dynamic>> childrenJson =

21
mobile/pubspec.yaml
View file

@ -12,34 +12,13 @@ dependencies:
audio_service:
flutter:
sdk: flutter
flutter_markdown:
meta:
moor:
moor_ffi:
musicus_client:
path: ../client
musicus_common:
path: ../common
musicus_player:
path: ../player
path:
path_provider:
rxdart:
shared_preferences:
url_launcher:
flutter:
uses-material-design: true
assets:
- assets/about.md
fonts:
- family: Libertinus Sans
fonts:
- asset: fonts/libertinussans_regular.otf
- asset: fonts/libertinussans_bold.otf
weight: 700
- asset: fonts/libertinussans_italic.otf
style: italic
- family: Musicus Icons
fonts:
- asset: fonts/musicus_icons.ttf