empathicqubit/mucke
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed provider; removed logging

Browse source
This commit is contained in:
Moritz Weber 2021-05-10 19:19:54 +02:00
parent d79722fcd6
commit a5dc7b7fa2
27 changed files with 96 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
lib/injection_container.dart
View file

@ -63,47 +63,38 @@ Future<void> setupGetIt() async {
print('setupGetIt');
// stores
getIt.registerFactory<MusicDataStore>(
() {
final musicDataStore = MusicDataStore(
musicDataInfoRepository: getIt(),
settingsRepository: getIt(),
musicDataModifierRepository: getIt(),
incrementLikeCount: getIt(),
setSongBlocked: getIt(),
updateDatabase: getIt(),
);
return musicDataStore;
},
getIt.registerLazySingleton<MusicDataStore>(
() => MusicDataStore(
musicDataInfoRepository: getIt(),
settingsRepository: getIt(),
musicDataModifierRepository: getIt(),
incrementLikeCount: getIt(),
setSongBlocked: getIt(),
updateDatabase: getIt(),
),
);
getIt.registerFactory<AudioStore>(
() {
final audioStore = AudioStore(
audioPlayerInfoRepository: getIt(),
addToQueue: getIt(),
moveQueueItem: getIt(),
pause: getIt(),
play: getIt(),
playAlbum: getIt(),
playArtist: getIt(),
playNext: getIt(),
playSongs: getIt(),
removeQueueIndex: getIt(),
seekToIndex: getIt(),
seekToNext: getIt(),
seekToPrevious: getIt(),
setLoopMode: getIt(),
setShuffleMode: getIt(),
shuffleAll: getIt(),
);
return audioStore;
},
getIt.registerLazySingleton<AudioStore>(
() => AudioStore(
audioPlayerInfoRepository: getIt(),
addToQueue: getIt(),
moveQueueItem: getIt(),
pause: getIt(),
play: getIt(),
playAlbum: getIt(),
playArtist: getIt(),
playNext: getIt(),
playSongs: getIt(),
removeQueueIndex: getIt(),
seekToIndex: getIt(),
seekToNext: getIt(),
seekToPrevious: getIt(),
setLoopMode: getIt(),
setShuffleMode: getIt(),
shuffleAll: getIt(),
),
);
getIt.registerFactory<NavigationStore>(
() {
final navigationStore = NavigationStore();
return navigationStore;
},
getIt.registerLazySingleton<NavigationStore>(
() => NavigationStore(),
);
getIt.registerFactoryParam<ArtistPageStore, Artist, void>(
(Artist artist, _) => ArtistPageStore(artist: artist, musicDataInfoRepository: getIt()),

23
lib/main.dart
View file

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_fimber_filelogger/flutter_fimber_filelogger.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import 'injection_container.dart';
import 'presentation/pages/currently_playing.dart';
@ -13,7 +13,6 @@ import 'presentation/pages/library_page.dart';
import 'presentation/pages/settings_page.dart';
import 'presentation/state/navigation_store.dart';
import 'presentation/theming.dart';
import 'presentation/widgets/injection_widget.dart';
import 'presentation/widgets/navbar.dart';
Future<void> main() async {
@ -43,16 +42,14 @@ class MyApp extends StatelessWidget {
DeviceOrientation.portraitUp,
]);
return InjectionWidget(
child: MaterialApp(
title: 'mucke',
theme: theme(),
initialRoute: '/',
routes: {
'/': (context) => const RootPage(),
'/playing': (context) => const CurrentlyPlayingPage(),
},
),
return MaterialApp(
title: 'mucke',
theme: theme(),
initialRoute: '/',
routes: {
'/': (context) => const RootPage(),
'/playing': (context) => const CurrentlyPlayingPage(),
},
);
}
}
@ -82,7 +79,7 @@ class _RootPageState extends State<RootPage> {
@override
Widget build(BuildContext context) {
final NavigationStore navStore = Provider.of<NavigationStore>(context);
final NavigationStore navStore = GetIt.I<NavigationStore>();
print('RootPage.build');
return Observer(

2
lib/presentation/pages/album_details_page.dart
View file

@ -39,7 +39,7 @@ class _AlbumDetailsPageState extends State<AlbumDetailsPage> {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/pages/albums_page.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/album.dart';
import '../state/music_data_store.dart';
@ -18,7 +18,7 @@ class _AlbumsPageState extends State<AlbumsPage> with AutomaticKeepAliveClientMi
@override
Widget build(BuildContext context) {
print('AlbumsPage.build');
final MusicDataStore store = Provider.of<MusicDataStore>(context);
final MusicDataStore store = GetIt.I<MusicDataStore>();
super.build(context);
return Observer(builder: (_) {

3
lib/presentation/pages/artist_details_page.dart
View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:get_it/get_it.dart';
import 'package:provider/provider.dart';
import '../../domain/entities/album.dart';
import '../../domain/entities/artist.dart';
@ -40,7 +39,7 @@ class _ArtistDetailsPageState extends State<ArtistDetailsPage> {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) => SafeArea(

4
lib/presentation/pages/artists_page.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/artist.dart';
import '../state/music_data_store.dart';
@ -17,7 +17,7 @@ class _ArtistsPageState extends State<ArtistsPage> with AutomaticKeepAliveClient
@override
Widget build(BuildContext context) {
print('ArtistsPage.build');
final MusicDataStore musicDataStore = Provider.of<MusicDataStore>(context);
final MusicDataStore musicDataStore = GetIt.I<MusicDataStore>();
super.build(context);
return Observer(builder: (_) {

12
lib/presentation/pages/currently_playing.dart
View file

@ -1,7 +1,7 @@
import 'package:fimber/fimber.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:logging/logging.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/song.dart';
import '../state/audio_store.dart';
@ -17,12 +17,12 @@ import 'queue_page.dart';
class CurrentlyPlayingPage extends StatelessWidget {
const CurrentlyPlayingPage({Key key}) : super(key: key);
static final _log = Logger('CurrentlyPlayingPage');
static final _log = FimberLog('CurrentlyPlayingPage');
@override
Widget build(BuildContext context) {
_log.info('build started');
final AudioStore audioStore = Provider.of<AudioStore>(context);
_log.d('build started');
final AudioStore audioStore = GetIt.I<AudioStore>();
return Scaffold(
body: SafeArea(
@ -36,7 +36,7 @@ class CurrentlyPlayingPage extends StatelessWidget {
},
child: Observer(
builder: (BuildContext context) {
_log.info('Observer.build');
_log.d('Observer.build');
final Song song = audioStore.currentSongStream.value;
return Stack(

4
lib/presentation/pages/library_page.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/navigation_store.dart';
import 'library_tab_container.dart';
@ -12,7 +12,7 @@ class LibraryPage extends StatelessWidget {
print('LibraryPage.build');
final GlobalKey<NavigatorState> nav = GlobalKey();
final NavigationStore navStore = Provider.of<NavigationStore>(context);
final NavigationStore navStore = GetIt.I<NavigationStore>();
return WillPopScope(
child: Navigator(

4
lib/presentation/pages/queue_page.dart
View file

@ -2,8 +2,8 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:get_it/get_it.dart';
import 'package:mobx/mobx.dart';
import 'package:provider/provider.dart';
import 'package:reorderables/reorderables.dart';
import '../../domain/entities/song.dart';
@ -16,7 +16,7 @@ class QueuePage extends StatelessWidget {
@override
Widget build(BuildContext context) {
print('QueuePage.build');
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
final ObservableStream<int> queueIndexStream = audioStore.queueIndexStream;
final initialIndex = max(((queueIndexStream?.value) ?? 0) - 2, 0);

4
lib/presentation/pages/settings_page.dart
View file

@ -2,7 +2,7 @@ import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/music_data_store.dart';
import '../theming.dart';
@ -12,7 +12,7 @@ class SettingsPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final MusicDataStore store = Provider.of<MusicDataStore>(context);
final MusicDataStore store = GetIt.I<MusicDataStore>();
return ListView(
children: [

6
lib/presentation/pages/songs_page.dart
View file

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:get_it/get_it.dart';
import 'package:mobx/mobx.dart';
import 'package:provider/provider.dart';
import '../../domain/entities/song.dart';
import '../state/audio_store.dart';
@ -20,8 +20,8 @@ class _SongsPageState extends State<SongsPage> with AutomaticKeepAliveClientMixi
@override
Widget build(BuildContext context) {
print('SongsPage.build');
final MusicDataStore musicDataStore = Provider.of<MusicDataStore>(context);
final AudioStore audioStore = Provider.of<AudioStore>(context);
final MusicDataStore musicDataStore = GetIt.I<MusicDataStore>();
final AudioStore audioStore = GetIt.I<AudioStore>();
super.build(context);
return Observer(builder: (_) {

4
lib/presentation/widgets/artist_highlighted_songs.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/song.dart';
import '../state/artist_page_store.dart';
@ -15,7 +15,7 @@ class ArtistHighlightedSongs extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/currently_playing_bar.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/song.dart';
import '../pages/currently_playing.dart';
@ -15,7 +15,7 @@ class CurrentlyPlayingBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/currently_playing_header.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/audio_store.dart';
import '../theming.dart';
@ -12,7 +12,7 @@ class CurrentlyPlayingHeader extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Row(
children: [

33
lib/presentation/widgets/injection_widget.dart
View file

@ -1,33 +0,0 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../injection_container.dart';
import '../state/audio_store.dart';
import '../state/music_data_store.dart';
import '../state/navigation_store.dart';
class InjectionWidget extends StatelessWidget {
const InjectionWidget({Key key, this.child}) : super(key: key);
final Widget child;
@override
Widget build(BuildContext context) {
print('InjectionWidget.build');
return MultiProvider(
child: child,
providers: [
Provider<MusicDataStore>(
create: (_) => getIt<MusicDataStore>(),
),
Provider<AudioStore>(
create: (_) => getIt<AudioStore>(),
),
Provider<NavigationStore>(
create: (_) => getIt<NavigationStore>(),
),
],
);
}
}

6
lib/presentation/widgets/like_button.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/song.dart';
import '../state/audio_store.dart';
@ -14,8 +14,8 @@ class LikeButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final MusicDataStore musicDataStore = Provider.of<MusicDataStore>(context);
final AudioStore audioStore = Provider.of<AudioStore>(context);
final MusicDataStore musicDataStore = GetIt.I<MusicDataStore>();
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/loop_button.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/loop_mode.dart';
import '../state/audio_store.dart';
@ -12,7 +12,7 @@ class LoopButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/next_button.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/loop_mode.dart';
import '../state/audio_store.dart';
@ -12,7 +12,7 @@ class NextButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/next_indicator.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/audio_store.dart';
import 'next_song.dart';
@ -12,7 +12,7 @@ class NextIndicator extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/play_pause_button.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/audio_store.dart';
@ -12,7 +12,7 @@ class PlayPauseButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/previous_button.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/audio_store.dart';
@ -10,7 +10,7 @@ class PreviousButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return IconButton(
icon: const Icon(Icons.skip_previous_rounded),

4
lib/presentation/widgets/shuffle_all_button.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/audio_store.dart';
@ -11,7 +11,7 @@ class ShuffleAllButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Container(
constraints: BoxConstraints.expand(height: 40.0 + verticalPad * 2),

4
lib/presentation/widgets/shuffle_button.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/shuffle_mode.dart';
import '../state/audio_store.dart';
@ -12,7 +12,7 @@ class ShuffleButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

6
lib/presentation/widgets/song_bottom_sheet.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/song.dart';
import '../state/audio_store.dart';
@ -9,8 +9,8 @@ import 'song_info.dart';
class SongBottomSheet {
void call(Song song, BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context, listen: false);
final MusicDataStore musicDataStore = Provider.of<MusicDataStore>(context, listen: false);
final AudioStore audioStore = GetIt.I<AudioStore>();
final MusicDataStore musicDataStore = GetIt.I<MusicDataStore>();
showModalBottomSheet(
context: context,

6
lib/presentation/widgets/song_customization_buttons.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../../domain/entities/song.dart';
import '../state/audio_store.dart';
@ -12,8 +12,8 @@ class SongCustomizationButtons extends StatelessWidget {
@override
Widget build(BuildContext context) {
final MusicDataStore musicDataStore = Provider.of<MusicDataStore>(context);
final AudioStore audioStore = Provider.of<AudioStore>(context);
final MusicDataStore musicDataStore = GetIt.I<MusicDataStore>();
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

4
lib/presentation/widgets/time_progress_indicator.dart
View file

@ -2,7 +2,7 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:provider/provider.dart';
import 'package:get_it/get_it.dart';
import '../state/audio_store.dart';
import '../utils.dart';
@ -12,7 +12,7 @@ class TimeProgressIndicator extends StatelessWidget {
@override
Widget build(BuildContext context) {
final AudioStore audioStore = Provider.of<AudioStore>(context);
final AudioStore audioStore = GetIt.I<AudioStore>();
return Observer(
builder: (BuildContext context) {

8
lib/system/repositories/music_data_repository_impl.dart
View file

@ -1,4 +1,4 @@
import 'package:logging/logging.dart';
import 'package:fimber/fimber.dart';
import 'package:rxdart/rxdart.dart';
import '../../domain/entities/album.dart';
@ -25,7 +25,7 @@ class MusicDataRepositoryImpl implements MusicDataRepository {
final BehaviorSubject<Map<String, Song>> _songUpdateSubject = BehaviorSubject();
final BehaviorSubject<List<Song>> _songSubject = BehaviorSubject();
static final _log = Logger('MusicDataRepository');
static final _log = FimberLog('MusicDataRepositoryImpl');
@override
Stream<Map<String, Song>> get songUpdateStream => _songUpdateSubject.stream;
@ -66,7 +66,7 @@ class MusicDataRepositoryImpl implements MusicDataRepository {
@override
Future<void> updateDatabase() async {
_log.info('updateDatabase called');
_log.d('updateDatabase called');
final localMusic = await _localMusicFetcher.getLocalMusic();
@ -74,7 +74,7 @@ class MusicDataRepositoryImpl implements MusicDataRepository {
await _updateAlbums(localMusic['ALBUMS'] as List<AlbumModel>);
await _updateSongs(localMusic['SONGS'] as List<SongModel>);
_log.info('updateDatabase finished');
_log.d('updateDatabase finished');
}
@override