gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-15 18:25:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature(PhotoViewer): Keep screen alive during slideshow (#305)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-04-06 17:22:32 +02:00 • committed by GitHub
parent 3f9b1e7068
commit 2485dcfff0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:extended_image/extended_image.dart'; import 'package:extended_image/extended_image.dart';
import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:share_plus/share_plus.dart'; import 'package:share_plus/share_plus.dart';
import 'package:square_progress_indicator/square_progress_indicator.dart'; import 'package:square_progress_indicator/square_progress_indicator.dart';
import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:wakelock_plus/wakelock_plus.dart';
@ -21,6 +21,8 @@ import 'package:fladder/util/list_padding.dart';
import 'package:fladder/util/localization_helper.dart'; import 'package:fladder/util/localization_helper.dart';
import 'package:fladder/util/throttler.dart'; import 'package:fladder/util/throttler.dart';
import 'package:fladder/widgets/shared/elevated_icon.dart'; import 'package:fladder/widgets/shared/elevated_icon.dart';
import 'package:fladder/widgets/shared/full_screen_button.dart'
if (dart.library.html) 'package:fladder/widgets/shared/full_screen_button_web.dart';
import 'package:fladder/widgets/shared/progress_floating_button.dart'; import 'package:fladder/widgets/shared/progress_floating_button.dart';
class PhotoViewerControls extends ConsumerStatefulWidget { class PhotoViewerControls extends ConsumerStatefulWidget {
@ -129,6 +131,7 @@ class _PhotoViewerControllsState extends ConsumerState<PhotoViewerControls> with
@override @override
void dispose() { void dispose() {
timerController.dispose(); timerController.dispose();
closeFullScreen();
windowManager.removeListener(this); windowManager.removeListener(this);
super.dispose(); super.dispose();
} }
@ -269,6 +272,10 @@ class _PhotoViewerControllsState extends ConsumerState<PhotoViewerControls> with
) )
], ],
), ),
if (AdaptiveLayout.of(context).isDesktop) ...[
const SizedBox(width: 8),
const FullScreenButton(),
],
const SizedBox(width: 12), const SizedBox(width: 12),
], ],
), ),

14
lib/widgets/shared/progress_floating_button.dart
View file

@ -4,9 +4,10 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:async/async.dart'; import 'package:async/async.dart';
import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:square_progress_indicator/square_progress_indicator.dart'; import 'package:square_progress_indicator/square_progress_indicator.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
import 'package:fladder/util/simple_duration_picker.dart'; import 'package:fladder/util/simple_duration_picker.dart';
@ -46,6 +47,7 @@ class RestartableTimerController {
} }
RestartableTimer _startTimer() { RestartableTimer _startTimer() {
WakelockPlus.enable();
return RestartableTimer( return RestartableTimer(
_steps, _steps,
() { () {
@ -71,6 +73,9 @@ class RestartableTimerController {
}; };
void cancel() { void cancel() {
if (_timer?.isActive == true) {
WakelockPlus.disable();
}
_timer?.cancel(); _timer?.cancel();
_timer = null; _timer = null;
_isActiveController.add(false); _isActiveController.add(false);
@ -81,7 +86,12 @@ class RestartableTimerController {
_timer?.reset(); _timer?.reset();
} }
void dispose() => _timer?.cancel(); void dispose() {
if (_timer?.isActive == true) {
WakelockPlus.disable();
}
_timer?.cancel();
}
} }
class ProgressFloatingButton extends ConsumerStatefulWidget { class ProgressFloatingButton extends ConsumerStatefulWidget {