Skip to content

Commit ce2e5af

Browse files
authored
chore: update flutter and remove animated emoji because it causes flicker on some setups (#1343)
Fixes #1258
1 parent df33c99 commit ce2e5af

16 files changed

+33
-89
lines changed

.fvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.32.7"
2+
"flutter": "3.32.8"
33
}

lib/app/view/musicpod.dart

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,18 @@ class _MusicPodState extends State<MusicPod> {
3030
}
3131

3232
@override
33-
Widget build(BuildContext context) => ValueListenableBuilder(
34-
valueListenable: appRestartNotifier,
35-
builder: (context, key, child) {
36-
return FutureBuilder(
37-
key: key,
38-
future: _allReady,
39-
builder: (context, snapshot) => snapshot.hasError
40-
? SplashScreen(body: Center(child: Text(snapshot.error.toString())))
41-
: snapshot.hasData
42-
? isLinux
43-
? GtkApplication(
44-
onCommandLine: (args) =>
45-
di<PlayerService>().playPath(args.firstOrNull),
46-
child: const YaruMusicPodApp(),
47-
)
48-
: const MaterialMusicPodApp()
49-
: const SplashScreen(),
50-
);
51-
},
33+
Widget build(BuildContext context) => FutureBuilder(
34+
future: _allReady,
35+
builder: (context, snapshot) => snapshot.hasError
36+
? SplashScreen(body: Center(child: Text(snapshot.error.toString())))
37+
: snapshot.hasData
38+
? isLinux
39+
? GtkApplication(
40+
onCommandLine: (args) =>
41+
di<PlayerService>().playPath(args.firstOrNull),
42+
child: const YaruMusicPodApp(),
43+
)
44+
: const MaterialMusicPodApp()
45+
: const SplashScreen(),
5246
);
5347
}

lib/common/view/no_search_result_page.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32

43
import '../../extensions/build_context_x.dart';
54
import '../../l10n/l10n.dart';
5+
import 'ui_constants.dart';
66

77
class NoSearchResultPage extends StatelessWidget {
88
const NoSearchResultPage({super.key, this.message, this.icon});
@@ -33,14 +33,13 @@ class NoSearchResultPage extends StatelessWidget {
3333
child: Column(
3434
mainAxisSize: MainAxisSize.min,
3535
children: [
36-
icon ?? const AnimatedEmoji(AnimatedEmojis.thinkingFace),
37-
const SizedBox(height: 10),
3836
message ??
3937
Text(
4038
context.l10n.nothingFound,
4139
style: style,
4240
textAlign: TextAlign.center,
4341
),
42+
const SizedBox(height: kLargestSpace),
4443
],
4544
),
4645
),

lib/local_audio/view/album_page.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:collection/collection.dart';
32
import 'package:flutter/material.dart';
43
import 'package:watch_it/watch_it.dart';
@@ -53,7 +52,6 @@ class _AlbumPageState extends State<AlbumPage> {
5352
audioPageType: AudioPageType.album,
5453
audios: cachedAlbum,
5554
image: AlbumPageImage(audio: cachedAlbum.firstOrNull),
56-
noSearchResultIcons: const AnimatedEmoji(AnimatedEmojis.bubbles),
5755
noSearchResultMessage: Text(context.l10n.albumNotFound),
5856
pageTitle: cachedAlbum.firstWhereOrNull((e) => e.album != null)?.album,
5957
pageSubTitle: cachedAlbum
@@ -88,7 +86,6 @@ class _AlbumPageState extends State<AlbumPage> {
8886
audioPageType: AudioPageType.album,
8987
audios: album,
9088
image: AlbumPageImage(audio: album.firstOrNull),
91-
noSearchResultIcons: const AnimatedEmoji(AnimatedEmojis.bubbles),
9289
noSearchResultMessage: Text(context.l10n.albumNotFound),
9390
pageTitle: album.firstWhereOrNull((e) => e.album != null)?.album,
9491
pageSubTitle: album.firstWhereOrNull((e) => e.artist != null)?.artist,

lib/local_audio/view/local_audio_page.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32
import 'package:watch_it/watch_it.dart';
43

@@ -86,7 +85,6 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
8685
contentBuilder: (context, constraints) =>
8786
audios != null && audios.isEmpty
8887
? SliverNoSearchResultPage(
89-
icon: const AnimatedEmoji(AnimatedEmojis.bird),
9088
message: Column(
9189
mainAxisSize: MainAxisSize.min,
9290
children: [

lib/playlists/view/liked_audio_page.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32
import 'package:watch_it/watch_it.dart';
43

@@ -47,7 +46,6 @@ class _LikedAudioPageState extends State<LikedAudioPage> {
4746
pageId: text,
4847
),
4948
noSearchResultMessage: Text(context.l10n.likedSongsSubtitle),
50-
noSearchResultIcons: const AnimatedEmoji(AnimatedEmojis.twoHearts),
5149
audios: _likedAudios,
5250
audioPageType: AudioPageType.likedAudio,
5351
pageId: PageIDs.likedAudios,

lib/podcasts/view/podcasts_collection_body.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32
import 'package:watch_it/watch_it.dart';
43

@@ -89,7 +88,6 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
8988
? SliverLoadingGrid(limit: subsLength)
9089
: (subsLength == 0)
9190
? SliverNoSearchResultPage(
92-
icon: const AnimatedEmoji(AnimatedEmojis.faceInClouds),
9391
message: Column(
9492
mainAxisSize: MainAxisSize.min,
9593
children: [

lib/radio/view/favorite_radio_tags_grid.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32
import 'package:radio_browser_api/radio_browser_api.dart';
43
import 'package:watch_it/watch_it.dart';
@@ -36,7 +35,6 @@ class FavoriteRadioTagsGrid extends StatelessWidget with WatchItMixin {
3635
const OpenRadioSearchButton(),
3736
],
3837
),
39-
icon: const AnimatedEmoji(AnimatedEmojis.glowingStar),
4038
);
4139
}
4240

lib/radio/view/radio_history_list.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32
import 'package:watch_it/watch_it.dart';
43

@@ -34,7 +33,6 @@ class RadioHistoryList extends StatelessWidget with WatchItMixin {
3433

3534
if (length == 0) {
3635
return NoSearchResultPage(
37-
icon: emptyIcon ?? const AnimatedEmoji(AnimatedEmojis.crystalBall),
3836
message: emptyMessage ?? Text(context.l10n.emptyHearingHistory),
3937
);
4038
}
@@ -102,7 +100,6 @@ class SliverRadioHistoryList extends StatelessWidget with WatchItMixin {
102100
if (length == 0) {
103101
return SliverToBoxAdapter(
104102
child: NoSearchResultPage(
105-
icon: emptyIcon ?? const AnimatedEmoji(AnimatedEmojis.crystalBall),
106103
message: emptyMessage ?? Text(context.l10n.emptyHearingHistory),
107104
),
108105
);

lib/radio/view/starred_stations_grid.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:animated_emoji/animated_emoji.dart';
21
import 'package:flutter/material.dart';
32
import 'package:watch_it/watch_it.dart';
43

@@ -38,7 +37,6 @@ class StarredStationsGrid extends StatelessWidget with WatchItMixin {
3837
const OpenRadioSearchButton(),
3938
],
4039
),
41-
icon: const AnimatedEmoji(AnimatedEmojis.glowingStar),
4240
);
4341
}
4442

0 commit comments

Comments
 (0)