Skip to content

Commit

Permalink
Release 1.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Feichtmeier committed May 9, 2024
1 parent 51e545b commit a2311c1
Show file tree
Hide file tree
Showing 10 changed files with 76 additions and 42 deletions.
3 changes: 1 addition & 2 deletions lib/src/app/view/master_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
imageUrl: podcast.value.firstOrNull?.albumArtUrl ??
podcast.value.firstOrNull?.imageUrl,
),
iconBuilder: (context, selected) => PodcastPage.createIcon(
context: context,
iconBuilder: (context, selected) => PodcastPageSideBarIcon(
imageUrl: podcast.value.firstOrNull?.albumArtUrl ??
podcast.value.firstOrNull?.imageUrl,
),
Expand Down
2 changes: 2 additions & 0 deletions lib/src/common/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,12 @@ class Iconz {
? Icon(
Iconz().starFilled,
size: iconSize,
color: isStarred ? color : null,
)
: Icon(
Iconz().star,
size: iconSize,
color: isStarred ? color : null,
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/local_audio/view/album_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class AlbumPageControlButton extends StatelessWidget {
isSelected: libraryModel.isPinnedAlbum(id),
icon: Icon(
pinnedAlbum ? Iconz().pinFilled : Iconz().pin,
color: pinnedAlbum ? context.t.primaryColor : null,
color: pinnedAlbum ? context.t.colorScheme.primary : null,
),
onPressed: () {
if (libraryModel.isPinnedAlbum(id)) {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/local_audio/view/artist_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ class _ArtistPageControlPanel extends StatelessWidget with WatchItMixin {
IconButton(
icon: Icon(
Iconz().list,
color: !useGridView ? context.t.primaryColor : null,
color: !useGridView ? context.t.colorScheme.primary : null,
),
isSelected: !useGridView,
onPressed: () => setUseGridView(false),
),
IconButton(
icon: Icon(
Iconz().grid,
color: useGridView ? context.t.primaryColor : null,
color: useGridView ? context.t.colorScheme.primary : null,
),
isSelected: useGridView,
onPressed: () => setUseGridView(true),
Expand Down
21 changes: 17 additions & 4 deletions lib/src/patch_notes/patch_notes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const kPatchNotes20240424 = 'Hello MusicPod Users, this update includes\n'
'\n\nIf you like MusicPod please consider sponsoring me:'
'\n';

// 2024 05 205
// 2024 05 05
const kPatchNotes20240505disposed = 'patchNotes20240505disposed';
const kPatchNotesTitle20240505 = 'Patch notes: 2024-05-05';
const kPatchNotes20240505 = 'Hello MusicPod Users, this update includes\n'
Expand All @@ -207,8 +207,21 @@ const kPatchNotes20240505 = 'Hello MusicPod Users, this update includes\n'
'\n\nIf you like MusicPod please consider sponsoring me:'
'\n';

const kRecentPatchNotesDisposed = kPatchNotes20240505disposed;
const kRecentPatchNotesTitle = kPatchNotesTitle20240505;
const kRecentPatchNotes = kPatchNotes20240505;
// 2024 05 09
const kPatchNotes20240509disposed = 'patchNotes20240509disposed';
const kPatchNotesTitle20240509 = 'Patch notes: 2024-05-09';
const kPatchNotes20240509 = 'Hello MusicPod Users, this update includes\n'
'\n* All pages are now fully reworked, so that headers will now scroll away to give you more space'
'\n* MacOs and Windows has a new theme (Phoenix Theme), which is a moderate version of Material, without surface tint, without ripple effect, with better contrast and with improved menus and dialogs'
'\n* you can now search podcast category and authors from a podcast page label and subtitle'
'\n* more controls for full height player videos on hover'
'\n* full window and full screen have now better icons'
'\n* bug fixes'
'\n\nIf you like MusicPod please consider sponsoring me:'
'\n';

const kRecentPatchNotesDisposed = kPatchNotes20240509disposed;
const kRecentPatchNotesTitle = kPatchNotesTitle20240509;
const kRecentPatchNotes = kPatchNotes20240509;

const kPatchNotesDisposed = 'kPatchNotesDisposed';
1 change: 1 addition & 0 deletions lib/src/player/view/blurred_full_height_player_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class BlurredFullHeightPlayerImage extends StatelessWidget {
Widget build(BuildContext context) {
final theme = context.t;
return Opacity(
key: ValueKey(audio?.url),
opacity: theme.isLight ? 0.8 : 0.9,
child: SizedBox(
width: size.width,
Expand Down
72 changes: 46 additions & 26 deletions lib/src/podcasts/view/podcast_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import '../../../build_context_x.dart';
import '../../../common.dart';
import '../../../data.dart';
import '../../../get.dart';
import '../../../podcasts.dart';
import '../../common/explore_online_popup.dart';
import '../../common/sliver_audio_page_control_panel.dart';
import '../../l10n/l10n.dart';
Expand All @@ -22,32 +23,6 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
required this.title,
});

static Widget createIcon({
required BuildContext context,
String? imageUrl,
}) {
return ClipRRect(
borderRadius: BorderRadius.circular(5),
child: SizedBox(
width: sideBarImageSize,
height: sideBarImageSize,
child: SafeNetworkImage(
url: imageUrl,
fit: BoxFit.fitHeight,
filterQuality: FilterQuality.medium,
fallBackIcon: Icon(
Iconz().podcast,
size: sideBarImageSize,
),
errorIcon: Icon(
Iconz().podcast,
size: sideBarImageSize,
),
),
),
);
}

final String? imageUrl;
final String pageId;
final String title;
Expand All @@ -60,6 +35,13 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
watchPropertyValue((LibraryModel m) => m.lastPositions?.length);
watchPropertyValue((LibraryModel m) => m.downloadsLength);

void onTap(text) {
final podcastModel = getIt<PodcastModel>();
Navigator.of(context).maybePop();
podcastModel.setSearchQuery(text);
podcastModel.search(searchQuery: text);
}

return YaruDetailPage(
appBar: HeaderBar(
adaptive: true,
Expand Down Expand Up @@ -93,6 +75,8 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
subTitle: audios?.firstOrNull?.artist,
description: audios?.firstOrNull?.albumArtist,
title: title,
onLabelTab: onTap,
onSubTitleTab: onTap,
),
),
SliverAudioPageControlPanel(
Expand Down Expand Up @@ -197,3 +181,39 @@ class PodcastPageTitle extends StatelessWidget with WatchItMixin {
);
}
}

class PodcastPageSideBarIcon extends StatelessWidget {
const PodcastPageSideBarIcon({super.key, this.imageUrl});

final String? imageUrl;

@override
Widget build(BuildContext context) {
if (imageUrl == null) {
return SideBarFallBackImage(
child: Icon(Iconz().podcast),
);
}

return ClipRRect(
borderRadius: BorderRadius.circular(5),
child: SizedBox(
width: sideBarImageSize,
height: sideBarImageSize,
child: SafeNetworkImage(
url: imageUrl,
fit: BoxFit.fitHeight,
filterQuality: FilterQuality.medium,
fallBackIcon: Icon(
Iconz().podcast,
size: sideBarImageSize,
),
errorIcon: Icon(
Iconz().podcast,
size: sideBarImageSize,
),
),
),
);
}
}
5 changes: 2 additions & 3 deletions lib/src/radio/view/radio_page_star_button.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';

import '../../../build_context_x.dart';
import '../../../get.dart';
import '../../../l10n.dart';
import '../../../library.dart';
Expand Down Expand Up @@ -27,9 +28,7 @@ class RadioPageStarButton extends StatelessWidget with WatchItMixin {
: isStarred
? () => libraryModel.unStarStation(station.url!)
: () => libraryModel.addStarredStation(station.url!, {station}),
icon: Iconz().getAnimatedStar(
isStarred,
),
icon: Iconz().getAnimatedStar(isStarred, context.t.colorScheme.primary),
);
}
}
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1042,8 +1042,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "7ce9dadf3f021aa3e2cfa721c68675fe29d3e378"
resolved-ref: "7ce9dadf3f021aa3e2cfa721c68675fe29d3e378"
ref: "4486490240ba42cc668079064ad41f3ae8869d01"
resolved-ref: "4486490240ba42cc668079064ad41f3ae8869d01"
url: "https://github.com/Feichtmeier/phoenix_theme"
source: git
version: "0.0.1"
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: musicpod
description: Ubuntu music, radio and podcast player.
version: 1.3.7
version: 1.3.8

publish_to: "none"

Expand Down Expand Up @@ -54,7 +54,7 @@ dependencies:
phoenix_theme:
git:
url: https://github.com/Feichtmeier/phoenix_theme
ref: 7ce9dadf3f021aa3e2cfa721c68675fe29d3e378
ref: 4486490240ba42cc668079064ad41f3ae8869d01
pls: ^1.1.0
podcast_search: ^0.6.9
radio_browser_api: ^2.0.0+1
Expand Down

0 comments on commit a2311c1

Please sign in to comment.