Skip to content

Commit

Permalink
[Test] fix ios top padding
Browse files Browse the repository at this point in the history
  • Loading branch information
@canxin121
canxin121 committed Jul 12, 2024
1 parent 92bc49f commit 8ab63e3
Show file tree
Hide file tree
Showing 8 changed files with 260 additions and 250 deletions.
3 changes: 2 additions & 1 deletion lib/comps/music_container_comp/music_container_pulldown_menu.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ class _MusicContainerMenuState extends State<MusicContainerMenu> {
),
if (hasCache)
PullDownMenuItem(
onTap: () => delMusicCache(widget.musicContainer),
onTap: () => delMusicCache(widget.musicContainer,
showToastWhenNoMsuicCache: true),
title: '删除缓存',
icon: CupertinoIcons.delete_solid,
)
Expand Down
8 changes: 5 additions & 3 deletions lib/pages/local_music_container_listview_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:app_rhyme/pages/muti_select_pages/muti_select_local_music_list_page.dart';
import 'package:app_rhyme/pages/muti_select_pages/muti_select_local_music_container_listview_page.dart';
import 'package:app_rhyme/pages/reorder_pages/reorder_local_music_list_page.dart';
import 'package:app_rhyme/utils/logger.dart';
import 'package:chinese_font_library/chinese_font_library.dart';
Expand Down Expand Up @@ -285,10 +285,12 @@ class LocalMusicListChoicMenu extends StatelessWidget {
PullDownMenuItem(
onTap: () async {
for (var musicContainer in musicContainers) {
await delMusicCache(musicContainer);
await delMusicCache(musicContainer, showToast: false);
}
LogToast.success("删除所有音乐缓存", "删除所有音乐缓存成功",
"[LocalMusicListChoicMenu] Successfully deleted all music caches");
},
title: '取消缓存所有音乐',
title: '删除所有音乐缓存',
),
PullDownMenuItem(
onTap: () {
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/local_music_list_gridview_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:io';

import 'package:app_rhyme/pages/muti_select_pages/muti_select_local_music_list_grid_page.dart';
import 'package:app_rhyme/pages/muti_select_pages/muti_select_local_music_list_gridview_page.dart';
import 'package:app_rhyme/pages/reorder_pages/reorder_local_music_list_grid_page.dart';
import 'package:app_rhyme/utils/global_vars.dart';
import 'package:app_rhyme/utils/logger.dart';
Expand Down
168 changes: 84 additions & 84 deletions ...es/muti_select_local_music_list_page.dart → ..._local_music_container_listview_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:app_rhyme/pages/local_music_container_listview_page.dart';
import 'package:app_rhyme/src/rust/api/factory_bind.dart';
import 'package:app_rhyme/src/rust/api/mirrors.dart';
import 'package:app_rhyme/utils/cache_helper.dart';
import 'package:app_rhyme/utils/logger.dart';
import 'package:app_rhyme/utils/music_api_helper.dart';
import 'package:chinese_font_library/chinese_font_library.dart';
import 'package:flutter/cupertino.dart';
Expand Down Expand Up @@ -40,9 +41,7 @@ class MutiSelectLocalMusicContainerListPageState
super.initState();
WidgetsBinding.instance.addObserver(this);
controller.addListener(() {
setState(() {
print(111);
});
setState(() {});
});
}

Expand Down Expand Up @@ -114,91 +113,90 @@ class MutiSelectLocalMusicContainerListPageState

return CupertinoPageScaffold(
backgroundColor: backgroundColor,
navigationBar: CupertinoNavigationBar(
padding: const EdgeInsetsDirectional.only(end: 16),
backgroundColor: backgroundColor,
leading: CupertinoButton(
padding: const EdgeInsets.all(0),
child: Icon(CupertinoIcons.back, color: activeIconRed),
onPressed: () {
Navigator.pop(context);
},
),
trailing: MutiSelectLocalMusicContainerListChoiceMenu(
delSelected: handleDeleteSelected,
refresh: handleRefresh,
builder: (context, showMenu) => CupertinoButton(
child: Column(children: [
CupertinoNavigationBar(
padding: const EdgeInsetsDirectional.only(end: 16),
backgroundColor: backgroundColor,
leading: CupertinoButton(
padding: const EdgeInsets.all(0),
onPressed: showMenu,
child: Text(
'选项',
style: TextStyle(color: activeIconRed).useSystemChineseFont(),
child: Icon(CupertinoIcons.back, color: activeIconRed),
onPressed: () {
Navigator.pop(context);
},
),
trailing: MutiSelectLocalMusicContainerListChoiceMenu(
delSelected: handleDeleteSelected,
refresh: handleRefresh,
builder: (context, showMenu) => CupertinoButton(
padding: const EdgeInsets.all(0),
onPressed: showMenu,
child: Text(
'选项',
style: TextStyle(color: activeIconRed).useSystemChineseFont(),
),
),
musicListW: widget.musicList,
musicContainers: controller.value.selectedIndexes
.map((index) => widget.musicContainers[index])
.toList(),
cancelSelectAll: handleCancelSelectAll,
selectAll: handleSelectAll,
reverseSelect: handleReverseSelect,
),
musicListW: widget.musicList,
musicContainers: controller.value.selectedIndexes
.map((index) => widget.musicContainers[index])
.toList(),
cancelSelectAll: handleCancelSelectAll,
selectAll: handleSelectAll,
reverseSelect: handleReverseSelect,
),
),
child: Column(children: [
SafeArea(child: SizedBox(height: Platform.isIOS ? 0 : 10)),
widget.musicContainers.isEmpty
? Center(
child: Text(
"没有音乐",
style: TextStyle(
color: isDarkMode
? CupertinoColors.white
: CupertinoColors.black),
),
)
: Align(
key: ValueKey(controller.hashCode),
alignment: Alignment.topCenter,
child: DragSelectGridView(
gridController: controller,
padding:
const EdgeInsets.only(bottom: 100, left: 10, right: 10),
itemCount: widget.musicContainers.length,
triggerSelectionOnTap: true,
itemBuilder: (context, index, selected) {
final musicContainer = widget.musicContainers[index];
return Row(
key: ValueKey(
"${selected}_${musicContainer.hasCache()}_${musicContainer.hashCode}"),
children: [
Expanded(
child: MusicContainerListItem(
key: ValueKey(
"${musicContainer.hasCache()}_${musicContainer.hashCode}"),
showMenu: false,
musicContainer: musicContainer,
musicListW: widget.musicList,
),
),
Icon(
selected
? CupertinoIcons.check_mark_circled
: CupertinoIcons.circle,
color: selected
? CupertinoColors.systemGreen
: CupertinoColors.systemGrey4,
),
],
);
},
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 1,
mainAxisSpacing: 8.0,
crossAxisSpacing: 8.0,
childAspectRatio: 8 / 1,
),
),
)
Expanded(
child: widget.musicContainers.isEmpty
? Center(
child: Text(
"没有音乐",
style: TextStyle(
color: isDarkMode
? CupertinoColors.white
: CupertinoColors.black),
),
)
: Align(
key: ValueKey(controller.hashCode),
alignment: Alignment.topCenter,
child: DragSelectGridView(
gridController: controller,
padding: const EdgeInsets.only(
bottom: 100, top: 10, left: 10, right: 10),
itemCount: widget.musicContainers.length,
triggerSelectionOnTap: true,
itemBuilder: (context, index, selected) {
final musicContainer = widget.musicContainers[index];
return Row(
key:
ValueKey("${selected}_${musicContainer.info.id}"),
children: [
Expanded(
child: MusicContainerListItem(
showMenu: false,
musicContainer: musicContainer,
musicListW: widget.musicList,
),
),
Icon(
selected
? CupertinoIcons.check_mark_circled
: CupertinoIcons.circle,
color: selected
? CupertinoColors.systemGreen
: CupertinoColors.systemGrey4,
),
],
);
},
gridDelegate:
const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 1,
mainAxisSpacing: 8.0,
crossAxisSpacing: 8.0,
childAspectRatio: 8 / 1,
),
),
))
]),
);
}
Expand Down Expand Up @@ -239,6 +237,8 @@ class MutiSelectLocalMusicContainerListChoiceMenu extends StatelessWidget {
await delMusicCache(musicContainer);
refresh();
}
LogToast.success("删除选中音乐缓存", "删除选中音乐缓存成功",
"[MutiSelectLocalMusicContainerListChoiceMenu] Successfully deleted selected music caches");
}

Future<void> handleDeleteFromList() async {
Expand Down
55 changes: 25 additions & 30 deletions ...ti_select_local_music_list_grid_page.dart → ...elect_local_music_list_gridview_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,31 @@ class MutiSelectLocalMusicListGridPageState

return CupertinoPageScaffold(
backgroundColor: backgroundColor,
navigationBar: _buildNavigationBar(),
child: Column(children: [
SafeArea(child: SizedBox(height: Platform.isIOS ? 0 : 10)),
CupertinoNavigationBar(
padding: const EdgeInsetsDirectional.all(0),
leading: CupertinoButton(
padding: const EdgeInsets.all(0),
child: Icon(CupertinoIcons.back, color: activeIconRed),
onPressed: () {
Navigator.pop(context);
},
),
trailing: MutiSelectMusicListGridPageMenu(
builder: (context, showMenu) => CupertinoButton(
padding: const EdgeInsets.only(right: 16),
onPressed: showMenu,
child: Text(
"选项",
style: TextStyle(color: activeIconRed),
),
),
deleteMusicList: deleteMusicList,
selectAll: handleSelectAll,
cancelSelectAll: handleCancelSelectAll,
reverseSelect: handleReverseSelect,
),
),
widget.musicLists.isEmpty
? Center(
child: Text("没有歌单", style: TextStyle(color: textColor)),
Expand All @@ -140,7 +162,7 @@ class MutiSelectLocalMusicListGridPageState
child: DragSelectGridView(
gridController: controller,
padding: const EdgeInsets.only(
bottom: 100, left: 10, right: 10),
bottom: 100, top: 10, left: 10, right: 10),
itemCount: widget.musicLists.length,
triggerSelectionOnTap: true,
itemBuilder: (context, index, selected) {
Expand Down Expand Up @@ -182,33 +204,6 @@ class MutiSelectLocalMusicListGridPageState
)
]));
}

CupertinoNavigationBar _buildNavigationBar() {
return CupertinoNavigationBar(
padding: const EdgeInsetsDirectional.all(0),
leading: CupertinoButton(
padding: const EdgeInsets.all(0),
child: Icon(CupertinoIcons.back, color: activeIconRed),
onPressed: () {
Navigator.pop(context);
},
),
trailing: MutiSelectMusicListGridPageMenu(
builder: (context, showMenu) => CupertinoButton(
padding: const EdgeInsets.only(right: 16),
onPressed: showMenu,
child: Text(
"选项",
style: TextStyle(color: activeIconRed),
),
),
deleteMusicList: deleteMusicList,
selectAll: handleSelectAll,
cancelSelectAll: handleCancelSelectAll,
reverseSelect: handleReverseSelect,
),
);
}
}

@immutable
Expand Down
Loading

0 comments on commit 8ab63e3

Please sign in to comment.