EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-31 08:08:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: navigation Bar编辑

Browse Source 
Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
guozhigq
2024-11-24 11:35:50 +08:00
committed by bggRGjQaUbCoE
parent e2da6a2936
commit bcefaa123e
7 changed files with 279 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
lib/pages/main/controller.dart
View File

@@ -2,25 +2,21 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:PiliPalaX/grpc/grpc_repo.dart'; import 'package:PiliPalaX/grpc/grpc_repo.dart';
import 'package:PiliPalaX/pages/dynamics/view.dart';
import 'package:PiliPalaX/pages/home/view.dart';
import 'package:PiliPalaX/pages/media/view.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
import 'package:PiliPalaX/pages/dynamics/index.dart';
import 'package:PiliPalaX/pages/home/view.dart';
import 'package:PiliPalaX/pages/media/index.dart';
import 'package:PiliPalaX/utils/storage.dart'; import 'package:PiliPalaX/utils/storage.dart';
import '../../models/common/dynamic_badge_mode.dart'; import '../../models/common/dynamic_badge_mode.dart';
import '../../models/common/nav_bar_config.dart'; import '../../models/common/nav_bar_config.dart';
class MainController extends GetxController { class MainController extends GetxController {
List<Widget> pages = <Widget>[ List<Widget> pages = <Widget>[];
const HomePage(), RxList navigationBars = [].obs;
// const RankPage(),
const DynamicsPage(),
const MediaPage(),
];
RxList navigationBars = defaultNavigationBars.obs;
final StreamController<bool> bottomBarStream = final StreamController<bool> bottomBarStream =
StreamController<bool>.broadcast(); StreamController<bool>.broadcast();
Box setting = GStorage.setting; Box setting = GStorage.setting;
@@ -33,30 +29,31 @@ class MainController extends GetxController {
late bool checkDynamic; late bool checkDynamic;
late int dynamicPeriod; late int dynamicPeriod;
int? _lastCheckAt; int? _lastCheckAt;
int? dynIndex;
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
checkDynamic = GStorage.checkDynamic; checkDynamic = GStorage.checkDynamic;
dynamicPeriod = GStorage.dynamicPeriod; dynamicPeriod = GStorage.dynamicPeriod;
// if (setting.get(SettingBoxKey.autoUpdate, defaultValue: false)) {
// Utils.checkUpdate();
// }
hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true); hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
int defaultHomePage =
setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
selectedIndex = defaultNavigationBars
.indexWhere((item) => item['id'] == defaultHomePage);
dynamic userInfo = userInfoCache.get('userInfoCache'); dynamic userInfo = userInfoCache.get('userInfoCache');
userLogin.value = userInfo != null; userLogin.value = userInfo != null;
dynamicBadgeType = DynamicBadgeMode.values[setting.get( dynamicBadgeType = DynamicBadgeMode.values[setting.get(
SettingBoxKey.dynamicBadgeMode, SettingBoxKey.dynamicBadgeMode,
defaultValue: DynamicBadgeMode.number.code)]; defaultValue: DynamicBadgeMode.number.code)];
setNavBarConfig();
if (dynamicBadgeType != DynamicBadgeMode.hidden) { if (dynamicBadgeType != DynamicBadgeMode.hidden) {
if (checkDynamic) { dynIndex = navigationBars.indexWhere((e) => e['id'] == 1);
_lastCheckAt = DateTime.now().millisecondsSinceEpoch; if (dynIndex != -1) {
if (checkDynamic) {
_lastCheckAt = DateTime.now().millisecondsSinceEpoch;
}
getUnreadDynamic();
} else {
checkDynamic = false;
} }
getUnreadDynamic();
} }
} }
@@ -82,36 +79,28 @@ class MainController extends GetxController {
} }
void getUnreadDynamic() async { void getUnreadDynamic() async {
if (!userLogin.value) { if (!userLogin.value || dynIndex == null || dynIndex == -1) {
return; return;
} }
// not needed yet
// int dynamicItemIndex =
// navigationBars.indexWhere((item) => item['label'] == "动态");
// if (dynamicItemIndex == -1) return;
// var res = await CommonHttp.unReadDynamic();
// var data = res['data'];
// navigationBars[1]['count'] =
// data == null ? 0 : data.length; // 修改 count 属性为新的值
await GrpcRepo.dynRed().then((res) { await GrpcRepo.dynRed().then((res) {
if (res['status']) { if (res['status']) {
navigationBars[1]['count'] = res['data']; navigationBars[dynIndex!]['count'] = res['data'];
} }
}); });
navigationBars.refresh(); navigationBars.refresh();
} }
void clearUnread() async { void clearUnread() async {
// not needed yet if (dynamicBadgeType != DynamicBadgeMode.hidden) {
// int dynamicItemIndex = navigationBars[dynIndex!]['count'] = 0; // 修改 count 属性为新的值
// navigationBars.indexWhere((item) => item['label'] == "动态"); navigationBars.refresh();
// if (dynamicItemIndex == -1) return; }
navigationBars[1]['count'] = 0; // 修改 count 属性为新的值
navigationBars.refresh();
} }
void checkUnreadDynamic() { void checkUnreadDynamic() {
if (!userLogin.value || if (dynIndex == null ||
dynIndex == -1 ||
!userLogin.value ||
dynamicBadgeType == DynamicBadgeMode.hidden || dynamicBadgeType == DynamicBadgeMode.hidden ||
!checkDynamic) return; !checkDynamic) return;
int now = DateTime.now().millisecondsSinceEpoch; int now = DateTime.now().millisecondsSinceEpoch;
@@ -120,4 +109,28 @@ class MainController extends GetxController {
getUnreadDynamic(); getUnreadDynamic();
} }
} }
void setNavBarConfig() async {
List defaultNavTabs = [...defaultNavigationBars];
List navBarSort =
setting.get(SettingBoxKey.navBarSort, defaultValue: [0, 1, 2]);
defaultNavTabs.retainWhere((item) => navBarSort.contains(item['id']));
defaultNavTabs.sort((a, b) =>
navBarSort.indexOf(a['id']).compareTo(navBarSort.indexOf(b['id'])));
navigationBars.value = defaultNavTabs;
int defaultHomePage =
setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
int defaultIndex =
navigationBars.indexWhere((item) => item['id'] == defaultHomePage);
// 如果找不到匹配项，默认索引设置为0或其他合适的值
selectedIndex = defaultIndex != -1 ? defaultIndex : 0;
pages = navigationBars
.map<Widget>((e) => switch (e['id']) {
0 => HomePage(),
1 => DynamicsPage(),
2 => MediaPage(),
_ => throw UnimplementedError(),
})
.toList();
}
} }

214
lib/pages/main/view.dart
View File

@@ -152,58 +152,71 @@ class _MainAppState extends State<MainApp>
36.801 + 36.801 +
MediaQuery.of(context).padding.left, MediaQuery.of(context).padding.left,
child: Obx( child: Obx(
() => NavigationRail( () => _mainController.navigationBars.length > 1
groupAlignment: 1, ? NavigationRail(
minWidth: context.width * 0.0286 + 28.56, groupAlignment: 1,
backgroundColor: Colors.transparent, minWidth: context.width * 0.0286 + 28.56,
selectedIndex: _mainController.selectedIndex, backgroundColor: Colors.transparent,
onDestinationSelected: (value) => setIndex(value), selectedIndex: _mainController.selectedIndex,
labelType: NavigationRailLabelType.none, onDestinationSelected: setIndex,
leading: UserAndSearchVertical(ctr: _homeController), labelType: NavigationRailLabelType.none,
destinations: _mainController.navigationBars leading:
.map((e) => NavigationRailDestination( UserAndSearchVertical(ctr: _homeController),
icon: _buildIcon( destinations: _mainController.navigationBars
id: e['id'], .map((e) => NavigationRailDestination(
count: e['count'], icon: _buildIcon(
icon: e['icon'], id: e['id'],
), count: e['count'],
selectedIcon: _buildIcon( icon: e['icon'],
id: e['id'], ),
count: e['count'], selectedIcon: _buildIcon(
icon: e['selectIcon'], id: e['id'],
), count: e['count'],
label: Text(e['label']), icon: e['selectIcon'],
padding: EdgeInsets.symmetric( ),
vertical: 0.01 * context.height), label: Text(e['label']),
)) padding: EdgeInsets.symmetric(
.toList(), vertical: 0.01 * context.height),
trailing: SizedBox(height: 0.1 * context.height), ))
), .toList(),
trailing: SizedBox(height: 0.1 * context.height),
)
: Container(
padding: EdgeInsets.only(
top: MediaQuery.paddingOf(context).top + 10),
constraints: BoxConstraints(
minWidth: context.width * 0.0286 + 28.56,
),
child:
UserAndSearchVertical(ctr: _homeController),
),
), ),
), ),
] else if (!isPortait) ] else if (!isPortait)
Obx( Obx(
() => NavigationRail( () => _mainController.navigationBars.length > 1
onDestinationSelected: (value) => setIndex(value), ? NavigationRail(
selectedIndex: _mainController.selectedIndex, onDestinationSelected: setIndex,
destinations: _mainController.navigationBars selectedIndex: _mainController.selectedIndex,
.map( destinations: _mainController.navigationBars
(e) => NavigationRailDestination( .map(
icon: _buildIcon( (e) => NavigationRailDestination(
id: e['id'], icon: _buildIcon(
count: e['count'], id: e['id'],
icon: e['icon'], count: e['count'],
), icon: e['icon'],
selectedIcon: _buildIcon( ),
id: e['id'], selectedIcon: _buildIcon(
count: e['count'], id: e['id'],
icon: e['selectIcon'], count: e['count'],
), icon: e['selectIcon'],
label: Text(e['label']), ),
), label: Text(e['label']),
),
)
.toList(),
) )
.toList(), : const SizedBox.shrink(),
),
), ),
VerticalDivider( VerticalDivider(
width: 1, width: 1,
@@ -240,60 +253,65 @@ class _MainAppState extends State<MainApp>
offset: Offset(0, snapshot.data ? 0 : 1), offset: Offset(0, snapshot.data ? 0 : 1),
child: enableMYBar child: enableMYBar
? Obx( ? Obx(
() => NavigationBar( () => _mainController.navigationBars.length > 1
onDestinationSelected: (value) => ? NavigationBar(
setIndex(value), onDestinationSelected: setIndex,
selectedIndex: _mainController.selectedIndex, selectedIndex:
destinations: _mainController.selectedIndex,
_mainController.navigationBars.map( destinations:
(e) { _mainController.navigationBars.map(
return NavigationDestination( (e) {
icon: _buildIcon( return NavigationDestination(
id: e['id'], icon: _buildIcon(
count: e['count'], id: e['id'],
icon: e['icon'], count: e['count'],
), icon: e['icon'],
selectedIcon: _buildIcon( ),
id: e['id'], selectedIcon: _buildIcon(
count: e['count'], id: e['id'],
icon: e['selectIcon'], count: e['count'],
), icon: e['selectIcon'],
label: e['label'], ),
); label: e['label'],
}, );
).toList(), },
), ).toList(),
)
: const SizedBox.shrink(),
) )
: Obx( : Obx(
() => BottomNavigationBar( () => _mainController.navigationBars.length > 1
currentIndex: _mainController.selectedIndex, ? BottomNavigationBar(
onTap: (value) => setIndex(value), currentIndex:
iconSize: 16, _mainController.selectedIndex,
selectedFontSize: 12, onTap: setIndex,
unselectedFontSize: 12, iconSize: 16,
type: BottomNavigationBarType.fixed, selectedFontSize: 12,
// selectedItemColor: unselectedFontSize: 12,
// Theme.of(context).colorScheme.primary, // 选中项的颜色 type: BottomNavigationBarType.fixed,
// unselectedItemColor: // selectedItemColor:
// Theme.of(context).colorScheme.onSurface, // Theme.of(context).colorScheme.primary, // 选中项的颜色
items: _mainController.navigationBars // unselectedItemColor:
.map( // Theme.of(context).colorScheme.onSurface,
(e) => BottomNavigationBarItem( items: _mainController.navigationBars
icon: _buildIcon( .map(
id: e['id'], (e) => BottomNavigationBarItem(
count: e['count'], icon: _buildIcon(
icon: e['icon'], id: e['id'],
), count: e['count'],
activeIcon: _buildIcon( icon: e['icon'],
id: e['id'], ),
count: e['count'], activeIcon: _buildIcon(
icon: e['selectIcon'], id: e['id'],
), count: e['count'],
label: e['label'], icon: e['selectIcon'],
), ),
label: e['label'],
),
)
.toList(),
) )
.toList(), : const SizedBox.shrink(),
),
), ),
); );
}, },

1
lib/pages/rcmd/controller.dart
View File

@@ -1,5 +1,4 @@
import 'package:PiliPalaX/http/loading_state.dart'; import 'package:PiliPalaX/http/loading_state.dart';
import 'package:PiliPalaX/models/home/rcmd/result.dart';
import 'package:PiliPalaX/pages/common/popup_controller.dart'; import 'package:PiliPalaX/pages/common/popup_controller.dart';
import 'package:PiliPalaX/http/video.dart'; import 'package:PiliPalaX/http/video.dart';
import 'package:PiliPalaX/utils/storage.dart'; import 'package:PiliPalaX/utils/storage.dart';

100
lib/pages/setting/navigation_bar_set.dart Normal file
View File

@@ -0,0 +1,100 @@
import 'package:PiliPalaX/utils/storage.dart';
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import '../../../models/common/nav_bar_config.dart';
class NavigationBarSetPage extends StatefulWidget {
const NavigationBarSetPage({super.key});
@override
State<NavigationBarSetPage> createState() => _NavigationbarSetPageState();
}
class _NavigationbarSetPageState extends State<NavigationBarSetPage> {
late List defaultNavTabs;
late List<int> navBarSort;
@override
void initState() {
super.initState();
defaultNavTabs = defaultNavigationBars;
navBarSort =
GStorage.setting.get(SettingBoxKey.navBarSort, defaultValue: [0, 1, 2]);
// 对 tabData 进行排序
defaultNavTabs.sort((a, b) {
int indexA = navBarSort.indexOf(a['id']);
int indexB = navBarSort.indexOf(b['id']);
// 如果类型在 sortOrder 中不存在，则放在末尾
if (indexA == -1) indexA = navBarSort.length;
if (indexB == -1) indexB = navBarSort.length;
return indexA.compareTo(indexB);
});
}
void saveEdit() {
List<int> sortedTabbar = defaultNavTabs
.where((i) => navBarSort.contains(i['id']))
.map<int>((i) => i['id'])
.toList();
if (sortedTabbar.isEmpty) {
sortedTabbar = [0, 1, 2];
}
GStorage.setting.put(SettingBoxKey.navBarSort, sortedTabbar);
SmartDialog.showToast('保存成功，下次启动时生效');
}
void onReorder(int oldIndex, int newIndex) {
setState(() {
if (newIndex > oldIndex) {
newIndex -= 1;
}
final tabsItem = defaultNavTabs.removeAt(oldIndex);
defaultNavTabs.insert(newIndex, tabsItem);
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Navbar编辑'),
actions: [
TextButton(
onPressed: saveEdit,
child: const Text('保存'),
),
const SizedBox(width: 12)
],
),
body: ReorderableListView(
onReorder: onReorder,
physics: const NeverScrollableScrollPhysics(),
footer: SizedBox(
height: MediaQuery.of(context).padding.bottom + 30,
),
children: defaultNavTabs
.map(
(item) => CheckboxListTile(
key: Key(item['label']),
value: navBarSort.contains(item['id']),
onChanged: (bool? newValue) {
int tabTypeId = item['id'];
if (!newValue!) {
navBarSort.remove(tabTypeId);
} else {
navBarSort.add(tabTypeId);
}
setState(() {});
},
title: Text(item['label']),
secondary: const Icon(Icons.drag_indicator_rounded),
),
)
.toList(),
),
);
}
}

8
lib/pages/setting/style_setting.dart
View File

@@ -359,13 +359,19 @@ class _StyleSettingState extends State<StyleSetting> {
subtitle: Text('删除或调换首页标签页', style: subTitleStyle), subtitle: Text('删除或调换首页标签页', style: subTitleStyle),
leading: const Icon(Icons.toc_outlined), leading: const Icon(Icons.toc_outlined),
), ),
ListTile(
dense: false,
onTap: () => Get.toNamed('/navbarSetting'),
title: Text('Navbar编辑', style: titleStyle),
leading: const Icon(Icons.toc_outlined),
),
if (Platform.isAndroid) if (Platform.isAndroid)
ListTile( ListTile(
dense: false, dense: false,
onTap: () => Get.toNamed('/displayModeSetting'), onTap: () => Get.toNamed('/displayModeSetting'),
title: Text('屏幕帧率', style: titleStyle), title: Text('屏幕帧率', style: titleStyle),
leading: const Icon(Icons.autofps_select_outlined), leading: const Icon(Icons.autofps_select_outlined),
) ),
], ],
), ),
); );

4
lib/router/app_pages.dart
View File

@@ -2,6 +2,7 @@
import 'package:PiliPalaX/pages/member/new/member_page.dart'; import 'package:PiliPalaX/pages/member/new/member_page.dart';
import 'package:PiliPalaX/pages/member/new/widget/edit_profile_page.dart'; import 'package:PiliPalaX/pages/member/new/widget/edit_profile_page.dart';
import 'package:PiliPalaX/pages/setting/navigation_bar_set.dart';
import 'package:PiliPalaX/pages/setting/sponsor_block_page.dart'; import 'package:PiliPalaX/pages/setting/sponsor_block_page.dart';
import 'package:PiliPalaX/pages/video/detail/introduction/widgets/create_fav_page.dart'; import 'package:PiliPalaX/pages/video/detail/introduction/widgets/create_fav_page.dart';
import 'package:PiliPalaX/pages/webview/webview_page.dart'; import 'package:PiliPalaX/pages/webview/webview_page.dart';
@@ -186,6 +187,9 @@ class Routes {
CustomGetPage(name: '/sponsorBlock', page: () => const SponsorBlockPage()), CustomGetPage(name: '/sponsorBlock', page: () => const SponsorBlockPage()),
CustomGetPage(name: '/createFav', page: () => const CreateFavPage()), CustomGetPage(name: '/createFav', page: () => const CreateFavPage()),
CustomGetPage(name: '/editProfile', page: () => const EditProfilePage()), CustomGetPage(name: '/editProfile', page: () => const EditProfilePage()),
// navigation bar
CustomGetPage(
name: '/navbarSetting', page: () => const NavigationBarSetPage()),
]; ];
} }

3
lib/utils/storage.dart
View File

@@ -304,7 +304,8 @@ class SettingBoxKey {
tabbarSort = 'tabbarSort', // 首页tabbar tabbarSort = 'tabbarSort', // 首页tabbar
dynamicBadgeMode = 'dynamicBadgeMode', dynamicBadgeMode = 'dynamicBadgeMode',
hiddenSettingUnlocked = 'hiddenSettingUnlocked', hiddenSettingUnlocked = 'hiddenSettingUnlocked',
enableGradientBg = 'enableGradientBg'; enableGradientBg = 'enableGradientBg',
navBarSort = 'navBarSort';
} }
class LocalCacheKey { class LocalCacheKey {