nyne/pixes
1
0
Fork 0
mirror of https://github.com/wgh136/pixes.git synced 2025-09-27 21:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to flutter 3.27.0

Browse Source
This commit is contained in:
nyne
2024-12-14 17:08:55 +08:00
parent 86c6f13282
commit bd15053c2f
23 changed files with 284 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/pages/main_page.dart
View File

@@ -129,7 +129,7 @@ class _MainPageState extends State<MainPage>
);
}
return DefaultSelectionStyle.merge(
selectionColor: FluentTheme.of(context).selectionColor.withOpacity(0.4),
selectionColor: FluentTheme.of(context).selectionColor.toOpacity(0.4),
child: NavigationView(
appBar: buildAppBar(context, navigatorKey),
pane: NavigationPane(
@@ -355,9 +355,7 @@ class _MainPageState extends State<MainPage>
ValueListenable<bool> get canPopNotifier => popValue;
@override
PopInvokedCallback? get onPopInvoked => onPop;
void onPop(bool value) {
void onPopInvokedWithResult(bool didPop, result) {
if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
App.rootNavigatorKey.currentState?.pop();
} else if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
@@ -366,6 +364,9 @@ class _MainPageState extends State<MainPage>
SystemNavigator.pop();
}
}
@override
void onPopInvoked(bool didPop) { }
}
class _BackButton extends StatefulWidget {
@@ -416,7 +417,7 @@ class _BackButtonState extends State<_BackButton> {
return NavigationPaneTheme(
data: NavigationPaneTheme.of(context).merge(NavigationPaneThemeData(
unselectedIconColor: ButtonState.resolveWith((states) {
unselectedIconColor: WidgetStateProperty.resolveWith((states) {
if (states.isDisabled) {
return ButtonThemeData.buttonColor(context, states);
}
@@ -669,16 +670,16 @@ class UserPane extends PaneItem {
final tileColor = this.tileColor ??
theme.tileColor ??
kDefaultPaneItemColor(context, mode == PaneDisplayMode.top);
final newStates = states.toSet()..remove(ButtonStates.disabled);
final newStates = states.toSet()..remove(WidgetState.disabled);
if (selected && selectedTileColor != null) {
return selectedTileColor!.resolve(newStates);
}
return tileColor.resolve(
selected
? {
states.isHovering
? ButtonStates.pressing
: ButtonStates.hovering,
states.isHovered
? WidgetState.pressed
: WidgetState.hovered,
}
: newStates,
);