Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Organize playlists and local audio #671

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Organize playlists and local audio #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ccd05
Organize playlists and local audio
Feichtmeier Apr 19, 2024
0ad7647
Use getIt for local init in settings
Feichtmeier Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/library.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
export 'src/library/add_to_playlist_snack_bar.dart';
export 'src/playlists/view/add_to_playlist_snack_bar.dart';
export 'src/library/library_model.dart';
export 'src/library/library_service.dart';
export 'src/library/liked_audio_page.dart';
export 'src/library/manual_add_dialog.dart';
export 'src/library/playlist_page.dart';
18 changes: 9 additions & 9 deletions lib/local_audio.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export 'src/local_audio/album_page.dart';
export 'src/local_audio/album_view.dart';
export 'src/local_audio/artist_page.dart';
export 'src/local_audio/artists_view.dart';
export 'src/local_audio/failed_imports_content.dart';
export 'src/local_audio/local_audio_model.dart';
export 'src/local_audio/local_audio_page.dart';
export 'src/local_audio/local_audio_search_page.dart';
export 'src/local_audio/local_audio_service.dart';
export 'src/local_audio/shop_recommendations.dart';
export 'src/local_audio/titles_view.dart';
export 'src/local_audio/view/album_page.dart';
export 'src/local_audio/view/album_view.dart';
export 'src/local_audio/view/artist_page.dart';
export 'src/local_audio/view/artists_view.dart';
export 'src/local_audio/view/failed_imports_content.dart';
export 'src/local_audio/view/local_audio_page.dart';
export 'src/local_audio/view/local_audio_search_page.dart';
export 'src/local_audio/view/shop_recommendations.dart';
export 'src/local_audio/view/titles_view.dart';
5 changes: 5 additions & 0 deletions lib/playlists.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export 'src/playlists/view/add_to_playlist_dialog.dart';
export 'src/playlists/view/add_to_playlist_snack_bar.dart';
export 'src/playlists/view/liked_audio_page.dart';
export 'src/playlists/view/manual_add_dialog.dart';
export 'src/playlists/view/playlist_page.dart';
19 changes: 6 additions & 13 deletions lib/src/app/view/master_detail_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import '../../../get.dart';
import '../../../l10n.dart';
import '../../../library.dart';
import '../../../local_audio.dart';
import '../../../playlists.dart';
import '../../../podcasts.dart';
import '../../../radio.dart';
import '../../../settings.dart';
Expand All @@ -20,7 +21,6 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
@override
Widget build(BuildContext context) {
final libraryModel = watchIt<LibraryModel>();
final localAudioModel = getIt<LocalAudioModel>();
final masterItems = _createMasterItems(libraryModel: libraryModel);

return Scaffold(
Expand All @@ -37,12 +37,10 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
style: YaruTitleBarStyle.undecorated,
adaptive: false,
title: const Text('MusicPod'),
actions: [
actions: const [
Padding(
padding: const EdgeInsets.only(right: 10),
child: SettingsButton(
initLocalAudio: localAudioModel.init,
),
padding: EdgeInsets.only(right: 10),
child: SettingsButton(),
),
],
),
Expand Down Expand Up @@ -114,9 +112,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
_MasterItem(
titleBuilder: (context) => Text(context.l10n.likedSongs),
pageId: kLikedAudiosPageId,
pageBuilder: (context) => LikedAudioPage(
likedLocalAudios: libraryModel.likedAudios,
),
pageBuilder: (context) => const LikedAudioPage(),
subtitleBuilder: (context) => Text(context.l10n.playlist),
iconBuilder: (context, selected) =>
LikedAudioPage.createIcon(context: context, selected: selected),
Expand All @@ -126,10 +122,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
titleBuilder: (context) => Text(playlist.key),
subtitleBuilder: (context) => Text(context.l10n.playlist),
pageId: playlist.key,
pageBuilder: (context) => PlaylistPage(
playlist: playlist,
libraryModel: libraryModel,
),
pageBuilder: (context) => PlaylistPage(playlist: playlist),
iconBuilder: (context, selected) => SideBarFallBackImage(
color: getAlphabetColor(playlist.key),
child: Icon(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/common/like_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import '../../common.dart';
import '../../constants.dart';
import '../../data.dart';
import '../../library.dart';
import '../../playlists.dart';
import '../../theme.dart';
import '../l10n/l10n.dart';
import '../library/add_to_playlist_dialog.dart';

class LikeButton extends StatelessWidget {
const LikeButton({
Expand Down
1 change: 1 addition & 0 deletions lib/src/common/master_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import '../../constants.dart';
import '../../get.dart';
import '../../library.dart';
import '../../player.dart';
import '../../playlists.dart';

class MasterTile extends StatelessWidget {
const MasterTile({
Expand Down
16 changes: 8 additions & 8 deletions lib/src/local_audio/album_page.dart → lib/src/local_audio/view/album_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import 'dart:typed_data';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';

import '../../build_context_x.dart';
import '../../common.dart';
import '../../data.dart';
import '../../get.dart';
import '../../library.dart';
import '../../local_audio.dart';
import '../common/explore_online_popup.dart';
import '../l10n/l10n.dart';
import '../../../build_context_x.dart';
import '../../../common.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../../library.dart';
import '../../../local_audio.dart';
import '../../common/explore_online_popup.dart';
import '../../l10n/l10n.dart';

class AlbumPage extends StatelessWidget {
const AlbumPage({
Expand Down
16 changes: 8 additions & 8 deletions lib/src/local_audio/album_view.dart → lib/src/local_audio/view/album_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import 'package:flutter/material.dart';

import '../../common.dart';
import '../../constants.dart';
import '../../get.dart';
import '../../player.dart';
import '../../utils.dart';
import '../data/audio.dart';
import '../l10n/l10n.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../get.dart';
import '../../../player.dart';
import '../../../utils.dart';
import '../../data/audio.dart';
import '../../l10n/l10n.dart';
import 'album_page.dart';
import 'local_audio_model.dart';
import '../local_audio_model.dart';

class AlbumsView extends StatelessWidget {
const AlbumsView({
Expand Down
20 changes: 10 additions & 10 deletions lib/src/local_audio/artist_page.dart → lib/src/local_audio/view/artist_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:yaru/yaru.dart';

import '../../common.dart';
import '../../constants.dart';
import '../../data.dart';
import '../../get.dart';
import '../../local_audio.dart';
import '../../player.dart';
import '../../settings.dart';
import '../../utils.dart';
import '../common/explore_online_popup.dart';
import '../l10n/l10n.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../../local_audio.dart';
import '../../../player.dart';
import '../../../settings.dart';
import '../../../utils.dart';
import '../../common/explore_online_popup.dart';
import '../../l10n/l10n.dart';
import 'genre_page.dart';

class ArtistPage extends StatelessWidget with WatchItMixin {
Expand Down
12 changes: 6 additions & 6 deletions lib/src/local_audio/artists_view.dart → lib/src/local_audio/view/artists_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import 'package:flutter/material.dart';

import 'package:yaru/yaru.dart';

import '../../common.dart';
import '../../constants.dart';
import '../../data.dart';
import '../../get.dart';
import '../l10n/l10n.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../l10n/l10n.dart';
import 'artist_page.dart';
import 'local_audio_model.dart';
import '../local_audio_model.dart';

class ArtistsView extends StatelessWidget {
const ArtistsView({
Expand Down
4 changes: 2 additions & 2 deletions ...c/local_audio/failed_imports_content.dart → ...al_audio/view/failed_imports_content.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';

import '../../build_context_x.dart';
import '../l10n/l10n.dart';
import '../../../build_context_x.dart';
import '../../l10n/l10n.dart';

class FailedImportsContent extends StatelessWidget {
const FailedImportsContent({
Expand Down
14 changes: 7 additions & 7 deletions lib/src/local_audio/genre_page.dart → lib/src/local_audio/view/genre_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart';
import 'package:yaru/yaru.dart';

import '../../common.dart';
import '../../data.dart';
import '../../get.dart';
import '../../globals.dart';
import '../../l10n.dart';
import '../../local_audio.dart';
import '../../radio.dart';
import '../../../common.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../../globals.dart';
import '../../../l10n.dart';
import '../../../local_audio.dart';
import '../../../radio.dart';

class GenrePage extends StatelessWidget {
const GenrePage({required this.genre, super.key});
Expand Down
8 changes: 4 additions & 4 deletions lib/src/local_audio/genres_view.dart → lib/src/local_audio/view/genres_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import 'package:flutter/material.dart';

import 'package:yaru/yaru.dart';

import '../../common.dart';
import '../../constants.dart';
import '../../data.dart';
import '../l10n/l10n.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../data.dart';
import '../../l10n/l10n.dart';
import 'genre_page.dart';

class GenresView extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/local_audio/local_audio_body.dart → ...rc/local_audio/view/local_audio_body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import '../../data.dart';
import '../../../data.dart';
import 'album_view.dart';
import 'artists_view.dart';
import 'genres_view.dart';
Expand Down
12 changes: 6 additions & 6 deletions ...ocal_audio/local_audio_control_panel.dart → ...audio/view/local_audio_control_panel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:yaru/yaru.dart';

import '../../build_context_x.dart';
import '../../get.dart';
import '../../library.dart';
import '../../local_audio.dart';
import '../../theme.dart';
import '../l10n/l10n.dart';
import '../../../build_context_x.dart';
import '../../../get.dart';
import '../../../library.dart';
import '../../../local_audio.dart';
import '../../../theme.dart';
import '../../l10n/l10n.dart';
import 'local_audio_view.dart';

class LocalAudioControlPanel extends StatelessWidget with WatchItMixin {
Expand Down
24 changes: 12 additions & 12 deletions lib/src/local_audio/local_audio_page.dart → ...rc/local_audio/view/local_audio_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ import 'package:flutter/material.dart';

import 'package:yaru/yaru.dart';

import '../../app.dart';
import '../../build_context_x.dart';
import '../../common.dart';
import '../../constants.dart';
import '../../data.dart';
import '../../get.dart';
import '../../globals.dart';
import '../../local_audio.dart';
import '../../player.dart';
import '../l10n/l10n.dart';
import '../library/library_model.dart';
import '../settings/settings_model.dart';
import '../../../app.dart';
import '../../../build_context_x.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../../globals.dart';
import '../../../local_audio.dart';
import '../../../player.dart';
import '../../l10n/l10n.dart';
import '../../library/library_model.dart';
import '../../settings/settings_model.dart';
import 'local_audio_body.dart';
import 'local_audio_control_panel.dart';
import 'local_audio_view.dart';
Expand Down
16 changes: 8 additions & 8 deletions .../local_audio/local_audio_search_page.dart → ...l_audio/view/local_audio_search_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import 'package:flutter/material.dart';

import 'package:yaru/yaru.dart';

import '../../app.dart';
import '../../common.dart';
import '../../constants.dart';
import '../../get.dart';
import '../../globals.dart';
import '../../library.dart';
import '../../local_audio.dart';
import '../l10n/l10n.dart';
import '../../../app.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../get.dart';
import '../../../globals.dart';
import '../../../library.dart';
import '../../../local_audio.dart';
import '../../l10n/l10n.dart';
import 'local_audio_body.dart';
import 'local_audio_control_panel.dart';
import 'local_audio_view.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/src/local_audio/local_audio_view.dart → ...rc/local_audio/view/local_audio_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../l10n/l10n.dart';
import '../../l10n/l10n.dart';

enum LocalAudioView {
titles,
Expand Down
8 changes: 4 additions & 4 deletions ...src/local_audio/shop_recommendations.dart → ...ocal_audio/view/shop_recommendations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:yaru/yaru.dart';

import '../../build_context_x.dart';
import '../../constants.dart';
import '../common/common_widgets.dart';
import '../l10n/l10n.dart';
import '../../../build_context_x.dart';
import '../../../constants.dart';
import '../../common/common_widgets.dart';
import '../../l10n/l10n.dart';

class ShopRecommendations extends StatelessWidget {
const ShopRecommendations({super.key});
Expand Down
12 changes: 6 additions & 6 deletions lib/src/local_audio/titles_view.dart → lib/src/local_audio/view/titles_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart';

import '../../common.dart';
import '../../constants.dart';
import '../../data.dart';
import '../../get.dart';
import '../../utils.dart';
import '../../../common.dart';
import '../../../constants.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../../utils.dart';
import 'album_page.dart';
import 'artist_page.dart';
import 'local_audio_model.dart';
import '../local_audio_model.dart';

class TitlesView extends StatelessWidget {
const TitlesView({
Expand Down
12 changes: 6 additions & 6 deletions lib/src/library/add_to_playlist_dialog.dart → ...laylists/view/add_to_playlist_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:yaru/yaru.dart';

import '../../common.dart';
import '../../data.dart';
import '../../globals.dart';
import '../../l10n.dart';
import '../../library.dart';
import '../../theme.dart';
import '../../../common.dart';
import '../../../data.dart';
import '../../../globals.dart';
import '../../../l10n.dart';
import '../../../library.dart';
import '../../../theme.dart';

class AddToPlaylistDialog extends StatelessWidget {
const AddToPlaylistDialog({
Expand Down
Loading