Skip to content

Commit c48df34

Browse files
authored
chore: improve fix/feat templates and exlude app focus in fullheightplayer (#1309)
1 parent 97c88df commit c48df34

File tree

5 files changed

+35
-22
lines changed

5 files changed

+35
-22
lines changed

.github/ISSUE_TEMPLATE/feat--request.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
2-
name: 'feat: request'
2+
name: 'feat: REPLACE_THIS_TEXT'
33
about: Suggest an idea for this project
4-
title: ''
4+
title: 'feat: REPLACE_THIS_TEXT'
55
labels: ''
66
assignees: ''
7+
type: 'Feature'
78

89
---
910

.github/ISSUE_TEMPLATE/fix--bug-report.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
2-
name: 'fix: bug report'
2+
name: 'fix: REPLACE_THIS_TEXT'
33
about: Create a report to help us improve
4-
title: ''
4+
title: 'fix: REPLACE_THIS_TEXT'
55
labels: ''
6+
type: 'Bug'
67
assignees: ''
78

89
---

lib/app/view/desktop_home_page.dart

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class _DesktopHomePageState extends State<DesktopHomePage> {
6262
Widget build(BuildContext context) {
6363
final playerToTheRight = context.mediaQuerySize.width > kSideBarThreshHold;
6464
final isInFullWindowMode =
65-
watchPropertyValue((AppModel m) => m.fullWindowMode);
65+
watchPropertyValue((AppModel m) => m.fullWindowMode ?? false);
6666
final isVideo = watchPropertyValue((PlayerModel m) => m.isVideo == true);
6767

6868
registerStreamHandler(
@@ -104,23 +104,30 @@ class _DesktopHomePageState extends State<DesktopHomePage> {
104104
return Stack(
105105
alignment: Alignment.center,
106106
children: [
107-
Row(
108-
children: [
109-
Expanded(
110-
child: Column(
111-
children: [
112-
const Expanded(child: MasterDetailPage()),
113-
if (!playerToTheRight)
114-
const PlayerView(position: PlayerPosition.bottom),
115-
],
107+
ExcludeFocus(
108+
excluding: isInFullWindowMode == true,
109+
child: Row(
110+
children: [
111+
Expanded(
112+
child: Column(
113+
children: [
114+
const Expanded(child: MasterDetailPage()),
115+
if (!playerToTheRight)
116+
const PlayerView(position: PlayerPosition.bottom),
117+
],
118+
),
116119
),
117-
),
118-
if (playerToTheRight)
119-
const SizedBox(
120-
width: kSideBarPlayerWidth,
121-
child: PlayerView(position: PlayerPosition.sideBar),
122-
),
123-
],
120+
if (playerToTheRight)
121+
AnimatedOpacity(
122+
opacity: playerToTheRight ? 1 : 0,
123+
duration: const Duration(milliseconds: 300),
124+
child: const SizedBox(
125+
width: kSideBarPlayerWidth,
126+
child: PlayerView(position: PlayerPosition.sideBar),
127+
),
128+
),
129+
],
130+
),
124131
),
125132
if (isInFullWindowMode == true)
126133
Scaffold(

lib/common/view/audio_tile.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ class _AudioTileState extends State<AudioTile> {
8787
),
8888
_ => widget.allowLeadingImage
8989
? AudioTileImage(
90+
key: switch (widget.audio.audioType) {
91+
AudioType.radio => ValueKey(widget.audio.uuid),
92+
_ => null,
93+
},
9094
size: dimension,
9195
audio: widget.audio,
9296
)

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: musicpod
22
description: Ubuntu music, radio and podcast player.
3-
version: 2.12.0
3+
version: 2.12.0+1338
44

55
publish_to: "none"
66

0 commit comments

Comments
 (0)