Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

screensaver: init fix

Browse source
This commit is contained in:
Thibault Deckers 2023-03-09 19:11:22 +01:00
parent 102e3974e7
commit edab909fb0
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/model/device.dart
View file

@ -1,6 +1,7 @@
import 'package:aves/services/common/services.dart'; import 'package:aves/services/common/services.dart';
import 'package:device_info_plus/device_info_plus.dart'; import 'package:device_info_plus/device_info_plus.dart';
import 'package:floating/floating.dart'; import 'package:floating/floating.dart';
import 'package:flutter/services.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
@ -57,7 +58,12 @@ class Device {
_canAuthenticateUser = await auth.canCheckBiometrics || await auth.isDeviceSupported(); _canAuthenticateUser = await auth.canCheckBiometrics || await auth.isDeviceSupported();
final floating = Floating(); final floating = Floating();
_supportPictureInPicture = await floating.isPipAvailable; try {
_supportPictureInPicture = await floating.isPipAvailable;
} on PlatformException catch (_) {
// as of floating v2.0.0, plugin assumes activity and fails when bound via service
_supportPictureInPicture = false;
}
floating.dispose(); floating.dispose();
final capabilities = await deviceService.getCapabilities(); final capabilities = await deviceService.getCapabilities();

5
lib/widgets/viewer/entry_viewer_stack.dart
View file

@ -3,6 +3,7 @@ import 'dart:math';
import 'package:aves/app_mode.dart'; import 'package:aves/app_mode.dart';
import 'package:aves/model/actions/entry_actions.dart'; import 'package:aves/model/actions/entry_actions.dart';
import 'package:aves/model/actions/move_type.dart'; import 'package:aves/model/actions/move_type.dart';
import 'package:aves/model/device.dart';
import 'package:aves/model/entry.dart'; import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/filters/trash.dart'; import 'package:aves/model/filters/trash.dart';
@ -241,7 +242,9 @@ class _EntryViewerStackState extends State<EntryViewerStack> with EntryViewContr
onViewDisposed: (mainEntry, pageEntry) => viewStateConductor.reset(pageEntry ?? mainEntry), onViewDisposed: (mainEntry, pageEntry) => viewStateConductor.reset(pageEntry ?? mainEntry),
); );
return StreamBuilder<PiPStatus>( return StreamBuilder<PiPStatus>(
stream: _floating.pipStatus$, // as of floating v2.0.0, plugin assumes activity and fails when bound via service
// so we do not access status stream directly, but check for support first
stream: device.supportPictureInPicture ? _floating.pipStatus$ : Stream.value(PiPStatus.disabled),
builder: (context, snapshot) { builder: (context, snapshot) {
var pipEnabled = snapshot.data == PiPStatus.enabled; var pipEnabled = snapshot.data == PiPStatus.enabled;
return Stack( return Stack(