gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-07 21:48:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/update-flutter-version' into develop

Browse source
This commit is contained in:
PartyDonut 2024-09-30 20:37:13 +02:00
commit cc4b48448f
11 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.fvmrc
View file

@ -1,3 +1,3 @@
{ {
"flutter": "3.22.1" "flutter": "3.24.0"
} }

2
.vscode/settings.json vendored
View file

@ -2,7 +2,7 @@
"cSpell.words": [ "cSpell.words": [
"Jellyfin" "Jellyfin"
], ],
"dart.flutterSdkPath": ".fvm/versions/3.22.1", "dart.flutterSdkPath": ".fvm/versions/3.24.0",
"search.exclude": { "search.exclude": {
"**/.fvm": true "**/.fvm": true
}, },

2
lib/screens/book_viewer/book_viewer_screen.dart
View file

@ -78,7 +78,7 @@ class _BookViewerScreenState extends ConsumerState<BookViewerScreen> {
data: ThemesData.of(context).dark, data: ThemesData.of(context).dark,
child: PopScope( child: PopScope(
canPop: true, canPop: true,
onPopInvoked: (didPop) async { onPopInvokedWithResult: (didPop, result) async {
await ref.read(bookViewerProvider.notifier).stopPlayback(); await ref.read(bookViewerProvider.notifier).stopPlayback();
}, },
child: Scaffold( child: Scaffold(

2
lib/screens/library_search/library_search_screen.dart
View file

@ -131,7 +131,7 @@ class _LibrarySearchScreenState extends ConsumerState<LibrarySearchScreen> {
return PopScope( return PopScope(
canPop: !librarySearchResults.selecteMode, canPop: !librarySearchResults.selecteMode,
onPopInvoked: (popped) async { onPopInvokedWithResult: (didPop, result) {
if (librarySearchResults.selecteMode) { if (librarySearchResults.selecteMode) {
libraryProvider.toggleSelectMode(); libraryProvider.toggleSelectMode();
} }

2
lib/screens/login/lock_screen.dart
View file

@ -99,7 +99,7 @@ class _LockScreenState extends ConsumerState<LockScreen> with WidgetsBindingObse
final user = ref.watch(userProvider); final user = ref.watch(userProvider);
return PopScope( return PopScope(
canPop: false, canPop: false,
onPopInvoked: (didPop) { onPopInvokedWithResult: (didPop, result) {
if (!poppingLockScreen) { if (!poppingLockScreen) {
SystemNavigator.pop(); SystemNavigator.pop();
} }

2
lib/screens/photo_viewer/photo_viewer_controls.dart
View file

@ -115,7 +115,7 @@ class _PhotoViewerControllsState extends ConsumerState<PhotoViewerControls> with
final padding = MediaQuery.of(context).padding; final padding = MediaQuery.of(context).padding;
return PopScope( return PopScope(
onPopInvoked: (popped) async { onPopInvokedWithResult: (didPop, result) async {
await WakelockPlus.disable(); await WakelockPlus.disable();
}, },
child: KeyboardListener( child: KeyboardListener(

3
lib/screens/photo_viewer/photo_viewer_screen.dart
View file

@ -143,7 +143,8 @@ class _PhotoViewerScreenState extends ConsumerState<PhotoViewerScreen> with Widg
return Theme( return Theme(
data: ThemesData.of(context).dark, data: ThemesData.of(context).dark,
child: PopScope( child: PopScope(
onPopInvoked: (popped) async => SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge, overlays: []), onPopInvokedWithResult: (didPop, result) =>
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge, overlays: []),
child: MouseRegion( child: MouseRegion(
opaque: AdaptiveLayout.of(context).isDesktop, opaque: AdaptiveLayout.of(context).isDesktop,
onEnter: (event) => setState(() => _showOverlay(show: true)), onEnter: (event) => setState(() => _showOverlay(show: true)),

3
lib/screens/shared/detail_scaffold.dart
View file

@ -1,5 +1,4 @@
import 'package:ficonsax/ficonsax.dart'; import 'package:ficonsax/ficonsax.dart';
import 'package:fladder/screens/shared/animated_fade_size.dart';
import 'package:fladder/util/localization_helper.dart'; import 'package:fladder/util/localization_helper.dart';
import 'package:fladder/widgets/navigation_scaffold/components/settings_user_icon.dart'; import 'package:fladder/widgets/navigation_scaffold/components/settings_user_icon.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -75,7 +74,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
offset: const Offset(0, -5), child: FladderImage(image: widget.item?.getPosters?.primary)), offset: const Offset(0, -5), child: FladderImage(image: widget.item?.getPosters?.primary)),
), ),
), ),
AnimatedFadeSize( AnimatedSwitcher(
duration: const Duration(seconds: 1), duration: const Duration(seconds: 1),
child: currentWidget, child: currentWidget,
) )

2
lib/screens/video_player/video_player_controls.dart
View file

@ -81,7 +81,7 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
}, },
child: PopScope( child: PopScope(
canPop: false, canPop: false,
onPopInvoked: (didPop) { onPopInvokedWithResult: (didPop, result) {
if (!didPop) { if (!didPop) {
closePlayer(); closePlayer();
} }

2
lib/widgets/navigation_scaffold/navigation_scaffold.dart
View file

@ -52,7 +52,7 @@ class _NavigationScaffoldState extends ConsumerState<NavigationScaffold> {
final views = ref.watch(viewsProvider.select((value) => value.views)); final views = ref.watch(viewsProvider.select((value) => value.views));
return PopScope( return PopScope(
canPop: currentIndex == 0, canPop: currentIndex == 0,
onPopInvoked: (didPop) { onPopInvokedWithResult: (didPop, result) {
if (currentIndex != 0) { if (currentIndex != 0) {
widget.destinations.first.action!(); widget.destinations.first.action!();
} }

24
pubspec.lock
View file

@ -937,18 +937,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.4" version: "10.0.5"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.3" version: "3.0.5"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
@ -1033,10 +1033,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.8.0" version: "0.11.1"
media_kit: media_kit:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1113,10 +1113,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.12.0" version: "1.15.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -1782,10 +1782,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.0" version: "0.7.2"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@ -2014,10 +2014,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.2.1" version: "14.2.4"
volume_controller: volume_controller:
dependency: transitive dependency: transitive
description: description: