Skip to content

Commit a519f8c

Browse files
nini22Pnini22P
committed
rename widgets, fix get cover
1 parent 40e7162 commit a519f8c

9 files changed

Lines changed: 26 additions & 22 deletions

File tree

‎inno.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define MyAppURL "https://github.com/nini22P/iris"
88
#define MyAppExeName "iris.exe"
99
#define MyAppAssocName MyAppPublisher + "." + MyAppName + ".AssocFile"
10-
#define MyAppDesc "IRIS media player"
10+
#define MyAppDesc "IRIS player"
1111
#define MySetupMutex "iris_player"
1212
#define MyProcessName "iris"
1313

‎lib/hooks/use_cover.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ import 'package:flutter/widgets.dart';
33
import 'package:flutter_hooks/flutter_hooks.dart';
44
import 'package:flutter_zustand/flutter_zustand.dart';
55
import 'package:iris/models/file.dart';
6+
import 'package:iris/models/player.dart';
67
import 'package:iris/models/storages/local.dart';
78
import 'package:iris/models/storages/storage.dart';
89
import 'package:iris/store/use_play_queue_store.dart';
910
import 'package:iris/store/use_storage_store.dart';
1011
import 'package:iris/utils/files_filter.dart';
1112

12-
FileItem? useCover(BuildContext context) {
13+
FileItem? useCover(
14+
BuildContext context,
15+
MediaPlayer player,
16+
) {
1317
final playQueue =
1418
usePlayQueueStore().select(context, (state) => state.playQueue);
1519
final currentIndex =
@@ -57,7 +61,7 @@ FileItem? useCover(BuildContext context) {
5761
return images.firstWhereOrNull(
5862
(image) => image.name.split('.').first.toLowerCase() == 'cover') ??
5963
images.firstOrNull;
60-
}, [currentPlay?.file, dir]);
64+
}, [currentPlay?.file, dir, player.isPlaying]);
6165

6266
final cover = useFuture(getCover).data;
6367

‎lib/pages/home/history.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:iris/store/use_history_store.dart';
1111
import 'package:iris/store/use_play_queue_store.dart';
1212
import 'package:iris/utils/file_size_convert.dart';
1313
import 'package:iris/utils/get_localizations.dart';
14-
import 'package:iris/widgets/custom_chip.dart';
14+
import 'package:iris/widgets/app_chip.dart';
1515
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
1616

1717
class History extends HookWidget {
@@ -84,14 +84,14 @@ class History extends HookWidget {
8484
if ((progress.duration.inMilliseconds -
8585
progress.position.inMilliseconds) <=
8686
5000) {
87-
return CustomChip(text: '100%');
87+
return AppChip(text: '100%');
8888
}
8989
final String progressString =
9090
(progress.position.inMilliseconds /
9191
progress.duration.inMilliseconds *
9292
100)
9393
.toStringAsFixed(0);
94-
return CustomChip(text: '$progressString %');
94+
return AppChip(text: '$progressString %');
9595
} else {
9696
return const SizedBox();
9797
}
@@ -109,7 +109,7 @@ class History extends HookWidget {
109109
mainAxisSize: MainAxisSize.min,
110110
children: [
111111
const SizedBox(width: 4),
112-
CustomChip(
112+
AppChip(
113113
text: subtitleType,
114114
primary: true,
115115
),

‎lib/pages/player/iris_player.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import 'package:iris/store/use_play_queue_store.dart';
3535
import 'package:iris/utils/format_duration_to_minutes.dart';
3636
import 'package:iris/utils/get_localizations.dart';
3737
import 'package:iris/utils/resize_window.dart';
38-
import 'package:iris/widgets/custom_app_bar.dart';
38+
import 'package:iris/widgets/title_bar.dart';
3939
import 'package:iris/pages/player/control_bar/control_bar.dart';
4040
import 'package:media_kit_video/media_kit_video.dart';
4141
import 'package:video_player/video_player.dart';
@@ -57,7 +57,7 @@ class IrisPlayer extends HookWidget {
5757

5858
useAppLifecycle(player);
5959
useOrientation(context, player);
60-
final cover = useCover(context);
60+
final cover = useCover(context, player);
6161

6262
final isHover = useState(false);
6363
final isTouch = useState(false);
@@ -1032,7 +1032,7 @@ class IrisPlayer extends HookWidget {
10321032
windowManager.startDragging();
10331033
}
10341034
},
1035-
child: CustomAppBar(
1035+
child: TitleBar(
10361036
title: title,
10371037
player: player,
10381038
actions: [const SizedBox(width: 8)],

‎lib/pages/player/play_queue.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:iris/store/use_history_store.dart';
99
import 'package:iris/store/use_play_queue_store.dart';
1010
import 'package:iris/utils/file_size_convert.dart';
1111
import 'package:iris/utils/get_localizations.dart';
12-
import 'package:iris/widgets/custom_chip.dart';
12+
import 'package:iris/widgets/app_chip.dart';
1313
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
1414

1515
class PlayQueue extends HookWidget {
@@ -99,14 +99,14 @@ class PlayQueue extends HookWidget {
9999
if ((progress.duration.inMilliseconds -
100100
progress.position.inMilliseconds) <=
101101
5000) {
102-
return CustomChip(text: '100%');
102+
return AppChip(text: '100%');
103103
}
104104
final String progressString =
105105
(progress.position.inMilliseconds /
106106
progress.duration.inMilliseconds *
107107
100)
108108
.toStringAsFixed(0);
109-
return CustomChip(text: '$progressString %');
109+
return AppChip(text: '$progressString %');
110110
} else {
111111
return const SizedBox();
112112
}
@@ -123,7 +123,7 @@ class PlayQueue extends HookWidget {
123123
mainAxisSize: MainAxisSize.min,
124124
children: [
125125
const SizedBox(width: 4),
126-
CustomChip(
126+
AppChip(
127127
text: subtitleType,
128128
primary: true,
129129
),

‎lib/pages/storages/files.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import 'package:iris/utils/file_size_convert.dart';
1919
import 'package:iris/utils/files_sort.dart';
2020
import 'package:iris/utils/get_localizations.dart';
2121
import 'package:iris/utils/request_storage_permission.dart';
22-
import 'package:iris/widgets/custom_chip.dart';
22+
import 'package:iris/widgets/app_chip.dart';
2323
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
2424
import 'package:permission_handler/permission_handler.dart';
2525

@@ -217,7 +217,7 @@ class Files extends HookWidget {
217217
progress.position
218218
.inMilliseconds) <=
219219
5000) {
220-
return CustomChip(text: '100%');
220+
return AppChip(text: '100%');
221221
}
222222
final String progressString =
223223
(progress.position
@@ -226,7 +226,7 @@ class Files extends HookWidget {
226226
.inMilliseconds *
227227
100)
228228
.toStringAsFixed(0);
229-
return CustomChip(
229+
return AppChip(
230230
text: '$progressString %');
231231
} else {
232232
return const SizedBox();
@@ -245,7 +245,7 @@ class Files extends HookWidget {
245245
mainAxisSize: MainAxisSize.min,
246246
children: [
247247
const SizedBox(width: 4),
248-
CustomChip(
248+
AppChip(
249249
text: subtitleType,
250250
primary: true,
251251
),

lib/widgets/custom_chip.dart renamed to lib/widgets/app_chip.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import 'package:flutter/material.dart';
22

3-
class CustomChip extends StatelessWidget {
3+
class AppChip extends StatelessWidget {
44
final String text;
55
final bool primary;
66

7-
const CustomChip({super.key, required this.text, this.primary = false});
7+
const AppChip({super.key, required this.text, this.primary = false});
88

99
@override
1010
Widget build(BuildContext context) {

lib/widgets/custom_menu.dart renamed to lib/widgets/app_menu.dart

File renamed without changes.

lib/widgets/custom_app_bar.dart renamed to lib/widgets/title_bar.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import 'package:iris/utils/platform.dart';
99
import 'package:iris/utils/resize_window.dart';
1010
import 'package:window_manager/window_manager.dart';
1111

12-
class CustomAppBar extends HookWidget {
13-
const CustomAppBar({
12+
class TitleBar extends HookWidget {
13+
const TitleBar({
1414
super.key,
1515
this.title,
1616
required this.player,

0 commit comments

Comments
 (0)