Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions lib/common/widgets/focusable_widget.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import 'package:dpad/dpad.dart';
import 'package:flutter/material.dart';

class FocusableWidget extends StatelessWidget {
final Widget child;
final VoidCallback? onSelect;
final bool autofocus;
final bool selected;

const FocusableWidget({
super.key,
required this.child,
this.onSelect,
this.autofocus = false,
this.selected = false,
});

@override
Widget build(BuildContext context) {
return DpadFocusable(
autofocus: autofocus,
onSelect: onSelect,
builder: (context, isFocused, child) {
return AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
border: Border.all(
color: isFocused ? Colors.blue : (selected ? Colors.grey : Colors.transparent),
width: 2,
),
borderRadius: BorderRadius.circular(8),
),
child: child,
);
},
child: child,
);
}
}
22 changes: 19 additions & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'package:PiliPlus/plugin/pl_player/controller.dart';
import 'package:PiliPlus/router/app_pages.dart';
import 'package:PiliPlus/services/account_service.dart';
import 'package:PiliPlus/services/download/download_service.dart';
import 'package:PiliPlus/services/focus_management_service.dart';
import 'package:PiliPlus/services/service_locator.dart';
import 'package:PiliPlus/utils/app_scheme.dart';
import 'package:PiliPlus/utils/cache_manager.dart';
Expand All @@ -25,6 +26,7 @@ import 'package:PiliPlus/utils/storage_pref.dart';
import 'package:PiliPlus/utils/theme_utils.dart';
import 'package:PiliPlus/utils/utils.dart';
import 'package:catcher_2/catcher_2.dart';
import 'package:dpad/dpad.dart';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flex_seed_scheme/flex_seed_scheme.dart';
import 'package:flutter/foundation.dart';
Expand Down Expand Up @@ -84,7 +86,8 @@ void main() async {
}
Get
..lazyPut(AccountService.new)
..lazyPut(DownloadService.new);
..lazyPut(DownloadService.new)
..lazyPut(FocusManagementService.new);
HttpOverrides.global = _CustomHttpOverrides();

CacheManager.autoClearCache();
Expand Down Expand Up @@ -217,6 +220,18 @@ class MyApp extends StatelessWidget {
static ThemeData? darkThemeData;

static void _onBack() {
final focusService = Get.find<FocusManagementService>();
if (focusService.handleBackButton()) {
return;
}

if (focusService.currentState?.level == FocusLevel.lvl1) {
SmartDialog.showToast('再按一次退出应用');
// In a real app, you'd handle the double-press logic here.
// For now, we'll just show the toast.
return;
}

if (SmartDialog.checkExist()) {
SmartDialog.dismiss();
return;
Expand Down Expand Up @@ -257,7 +272,8 @@ class MyApp extends StatelessWidget {
}) {
late final brandColor = colorThemeTypes[Pref.customColor].color;
late final variant = FlexSchemeVariant.values[Pref.schemeVariant];
return GetMaterialApp(
return DpadNavigator(
child: GetMaterialApp(
title: Constants.appName,
theme: ThemeUtils.getThemeData(
colorScheme:
Expand Down Expand Up @@ -339,7 +355,7 @@ class MyApp extends StatelessWidget {
if (Utils.isDesktop) PointerDeviceKind.mouse,
},
),
);
));
}

@override
Expand Down
18 changes: 17 additions & 1 deletion lib/pages/dynamics/view.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:PiliPlus/common/widgets/focusable_widget.dart';
import 'package:PiliPlus/common/widgets/scroll_physics.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart';
import 'package:PiliPlus/services/focus_management_service.dart';
import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
import 'package:PiliPlus/models/dynamics/up.dart';
import 'package:PiliPlus/pages/dynamics/controller.dart';
Expand Down Expand Up @@ -124,7 +126,21 @@ class _DynamicsPageState extends State<DynamicsPage>
TabBarTheme.of(context).labelStyle?.copyWith(fontSize: 13) ??
const TextStyle(fontSize: 13),
tabs: _dynamicsController.displayedTabs
.map((e) => Tab(text: e.label))
.map((e) {
final index = _dynamicsController.displayedTabs.indexOf(e);
return FocusableWidget(
onSelect: () {
_dynamicsController.tabController.animateTo(index);
Get.find<FocusManagementService>().requestFocus(
FocusState(
level: index == 0 ? FocusLevel.lvl3 : FocusLevel.lvl4,
index: index,
),
);
},
child: Tab(text: e.label),
);
})
.toList(),
onTap: (index) {
if (!_dynamicsController.tabController.indexIsChanging) {
Expand Down
76 changes: 60 additions & 16 deletions lib/pages/main/view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:io';

import 'package:PiliPlus/common/constants.dart';
import 'package:PiliPlus/common/widgets/flutter/tabs.dart';
import 'package:PiliPlus/common/widgets/focusable_widget.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/models/common/dynamic/dynamic_badge_mode.dart';
import 'package:PiliPlus/models/common/image_type.dart';
Expand All @@ -11,6 +12,7 @@ import 'package:PiliPlus/pages/main/controller.dart';
import 'package:PiliPlus/pages/mine/controller.dart';
import 'package:PiliPlus/plugin/pl_player/controller.dart';
import 'package:PiliPlus/plugin/pl_player/models/play_status.dart';
import 'package:PiliPlus/services/focus_management_service.dart';
import 'package:PiliPlus/utils/app_scheme.dart';
import 'package:PiliPlus/utils/context_ext.dart';
import 'package:PiliPlus/utils/extension.dart';
Expand Down Expand Up @@ -252,14 +254,29 @@ class _MainAppState extends State<MainApp>
selectedIndex: _mainController.selectedIndex.value,
destinations: _mainController.navigationBars
.map(
(e) => NavigationDestination(
label: e.label,
icon: _buildIcon(type: e),
selectedIcon: _buildIcon(
type: e,
selected: true,
),
),
(e) {
final index = _mainController.navigationBars.indexOf(e);
return FocusableWidget(
onSelect: () {
Get.find<FocusManagementService>().requestFocus(
FocusState(
level: index == 0 ? FocusLevel.lvl1 : FocusLevel.lvl2,
index: index,
),
debounce: true,
);
_mainController.setIndex(index);
},
child: NavigationDestination(
label: e.label,
icon: _buildIcon(type: e),
selectedIcon: _buildIcon(
type: e,
selected: true,
),
),
);
},
)
.toList(),
),
Expand All @@ -274,14 +291,41 @@ class _MainAppState extends State<MainApp>
type: BottomNavigationBarType.fixed,
items: _mainController.navigationBars
.map(
(e) => BottomNavigationBarItem(
label: e.label,
icon: _buildIcon(type: e),
activeIcon: _buildIcon(
type: e,
selected: true,
),
),
(e) {
final index = _mainController.navigationBars.indexOf(e);
return BottomNavigationBarItem(
label: e.label,
icon: FocusableWidget(
onSelect: () {
Get.find<FocusManagementService>().requestFocus(
FocusState(
level: index == 0 ? FocusLevel.lvl1 : FocusLevel.lvl2,
index: index,
),
debounce: true,
);
_mainController.setIndex(index);
},
child: _buildIcon(type: e),
),
activeIcon: FocusableWidget(
onSelect: () {
Get.find<FocusManagementService>().requestFocus(
FocusState(
level: index == 0 ? FocusLevel.lvl1 : FocusLevel.lvl2,
index: index,
),
debounce: true,
);
_mainController.setIndex(index);
},
child: _buildIcon(
type: e,
selected: true,
),
),
);
},
)
.toList(),
),
Expand Down
32 changes: 22 additions & 10 deletions lib/pages/setting/view.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:PiliPlus/common/widgets/flutter/list_tile.dart';
import 'package:PiliPlus/common/widgets/focusable_widget.dart';
import 'package:PiliPlus/common/widgets/view_safe_area.dart';
import 'package:PiliPlus/http/login.dart';
import 'package:PiliPlus/models/common/setting_type.dart';
Expand All @@ -15,6 +16,7 @@ import 'package:PiliPlus/pages/webdav/view.dart';
import 'package:PiliPlus/utils/accounts.dart';
import 'package:PiliPlus/utils/accounts/account.dart';
import 'package:PiliPlus/utils/extension.dart';
import 'package:dpad/dpad.dart';
import 'package:flutter/material.dart' hide ListTile;
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart' hide ContextExtensionss;
Expand Down Expand Up @@ -177,36 +179,44 @@ class _SettingPageState extends State<SettingPage> {
..._items
.take(_items.length - 1)
.map(
(item) => ListTile(
(item) => FocusableWidget(
onSelect: () => _toPage(item.type),
child: ListTile(
tileColor: _getTileColor(theme, item.type),
onTap: () => _toPage(item.type),
leading: item.icon,
title: Text(item.type.title, style: titleStyle),
subtitle: item.subtitle == null
? null
: Text(item.subtitle!, style: subTitleStyle),
),
)),
),
ListTile(
FocusableWidget(
onSelect: () => LoginPageController.switchAccountDialog(context),
child: ListTile(
onTap: () => LoginPageController.switchAccountDialog(context),
leading: const Icon(Icons.switch_account_outlined),
title: Text('设置账号模式', style: titleStyle),
),
)),
Obx(
() => _noAccount.value
? const SizedBox.shrink()
: ListTile(
: FocusableWidget(
onSelect: () => _logoutDialog(context),
child: ListTile(
leading: const Icon(Icons.logout_outlined),
onTap: () => _logoutDialog(context),
title: Text('退出登录', style: titleStyle),
),
)),
),
ListTile(
FocusableWidget(
onSelect: () => _toPage(_items.last.type),
child: ListTile(
tileColor: _getTileColor(theme, _items.last.type),
onTap: () => _toPage(_items.last.type),
leading: _items.last.icon,
title: Text(_items.last.type.title, style: titleStyle),
),
)),
],
);
}
Expand Down Expand Up @@ -284,7 +294,9 @@ class _SettingPageState extends State<SettingPage> {
right: 16,
bottom: 8,
),
child: Material(
child: FocusableWidget(
onSelect: () => Get.toNamed('/settingsSearch'),
child: Material(
type: MaterialType.transparency,
child: InkWell(
onTap: () => Get.toNamed('/settingsSearch'),
Expand All @@ -309,6 +321,6 @@ class _SettingPageState extends State<SettingPage> {
),
),
),
),
)),
);
}
Loading