hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt to flutter 3

Browse Source
This commit is contained in:
csf 2022-05-26 18:25:16 +08:00
parent 4c6c1a95e0
commit fa5f48638f
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flutter/lib/common.dart
View File

@ -224,10 +224,10 @@ class AccessibilityListener extends StatelessWidget {
Widget build(BuildContext context) {
return Listener(
onPointerDown: (evt) {
if (evt.size == 1 && GestureBinding.instance != null) {
GestureBinding.instance!.handlePointerEvent(PointerAddedEvent(
if (evt.size == 1) {
GestureBinding.instance.handlePointerEvent(PointerAddedEvent(
pointer: evt.pointer + offset, position: evt.position));
GestureBinding.instance!.handlePointerEvent(PointerDownEvent(
GestureBinding.instance.handlePointerEvent(PointerDownEvent(
pointer: evt.pointer + offset,
size: 0.1,
position: evt.position));
@ -235,17 +235,17 @@ class AccessibilityListener extends StatelessWidget {
},
onPointerUp: (evt) {
if (evt.size == 1 && GestureBinding.instance != null) {
GestureBinding.instance!.handlePointerEvent(PointerUpEvent(
GestureBinding.instance.handlePointerEvent(PointerUpEvent(
pointer: evt.pointer + offset,
size: 0.1,
position: evt.position));
GestureBinding.instance!.handlePointerEvent(PointerRemovedEvent(
GestureBinding.instance.handlePointerEvent(PointerRemovedEvent(
pointer: evt.pointer + offset, position: evt.position));
}
},
onPointerMove: (evt) {
if (evt.size == 1 && GestureBinding.instance != null) {
GestureBinding.instance!.handlePointerEvent(PointerMoveEvent(
GestureBinding.instance.handlePointerEvent(PointerMoveEvent(
pointer: evt.pointer + offset,
size: 0.1,
delta: evt.delta,

2
flutter/lib/mobile/pages/remote_page.dart
View File

@ -45,7 +45,7 @@ class _RemotePageState extends State<RemotePage> {
void initState() {
super.initState();
FFI.connect(widget.id);
WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
showLoading(translate('Connecting...'));
_interval =

19
flutter/lib/mobile/widgets/gestures.dart
View File

@ -213,7 +213,7 @@ class HoldTapMoveGestureRecognizer extends GestureRecognizer {
_stopSecondTapDownTimer();
final _TapTracker tracker = _TapTracker(
event: event,
entry: GestureBinding.instance!.gestureArena.add(event.pointer, this),
entry: GestureBinding.instance.gestureArena.add(event.pointer, this),
doubleTapMinTime: kDoubleTapMinTime,
gestureSettings: gestureSettings,
);
@ -318,13 +318,13 @@ class HoldTapMoveGestureRecognizer extends GestureRecognizer {
final _TapTracker tracker = _firstTap!;
_firstTap = null;
_reject(tracker);
GestureBinding.instance!.gestureArena.release(tracker.pointer);
GestureBinding.instance.gestureArena.release(tracker.pointer);
if (_secondTap != null) {
final _TapTracker tracker = _secondTap!;
_secondTap = null;
_reject(tracker);
GestureBinding.instance!.gestureArena.release(tracker.pointer);
GestureBinding.instance.gestureArena.release(tracker.pointer);
}
}
_firstTap = null;
@ -334,7 +334,7 @@ class HoldTapMoveGestureRecognizer extends GestureRecognizer {
void _registerFirstTap(_TapTracker tracker) {
_startFirstTapUpTimer();
GestureBinding.instance!.gestureArena.hold(tracker.pointer);
GestureBinding.instance.gestureArena.hold(tracker.pointer);
// Note, order is important below in order for the clear -> reject logic to
// work properly.
_freezeTracker(tracker);
@ -350,7 +350,7 @@ class HoldTapMoveGestureRecognizer extends GestureRecognizer {
}
_startSecondTapDownTimer();
GestureBinding.instance!.gestureArena.hold(tracker.pointer);
GestureBinding.instance.gestureArena.hold(tracker.pointer);
_secondTap = tracker;
@ -463,7 +463,7 @@ class DoubleFinerTapGestureRecognizer extends GestureRecognizer {
void _trackTap(PointerDownEvent event) {
final _TapTracker tracker = _TapTracker(
event: event,
entry: GestureBinding.instance!.gestureArena.add(event.pointer, this),
entry: GestureBinding.instance.gestureArena.add(event.pointer, this),
doubleTapMinTime: kDoubleTapMinTime,
gestureSettings: gestureSettings,
);
@ -532,7 +532,7 @@ class DoubleFinerTapGestureRecognizer extends GestureRecognizer {
}
void _registerTap(_TapTracker tracker) {
GestureBinding.instance!.gestureArena.hold(tracker.pointer);
GestureBinding.instance.gestureArena.hold(tracker.pointer);
// Note, order is important below in order for the clear -> reject logic to
// work properly.
}
@ -615,15 +615,14 @@ class _TapTracker {
void startTrackingPointer(PointerRoute route, Matrix4? transform) {
if (!_isTrackingPointer) {
_isTrackingPointer = true;
GestureBinding.instance!.pointerRouter
.addRoute(pointer, route, transform);
GestureBinding.instance.pointerRouter.addRoute(pointer, route, transform);
}
}
void stopTrackingPointer(PointerRoute route) {
if (_isTrackingPointer) {
_isTrackingPointer = false;
GestureBinding.instance!.pointerRouter.removeRoute(pointer, route);
GestureBinding.instance.pointerRouter.removeRoute(pointer, route);
}
}

32
flutter/pubspec.lock
View File

@ -233,12 +233,10 @@ packages:
flutter_smart_dialog:
dependency: "direct main"
description:
path: "."
ref: HEAD
resolved-ref: c89ce60664cbc206cb98c1f407e86b8a766f4c0e
url: "https://github.com/Heap-Hop/flutter_smart_dialog.git"
source: git
version: "4.0.0"
name: flutter_smart_dialog
url: "https://pub.dartlang.org"
source: hosted
version: "4.3.1"
flutter_test:
dependency: "direct dev"
description: flutter
@ -269,7 +267,7 @@ packages:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.0"
version: "3.1.3"
image_picker:
dependency: "direct main"
description:
@ -458,7 +456,7 @@ packages:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.0"
version: "4.4.0"
platform:
dependency: transitive
description:
@ -490,9 +488,11 @@ packages:
qr_code_scanner:
dependency: "direct main"
description:
name: qr_code_scanner
url: "https://pub.dartlang.org"
source: hosted
path: "."
ref: fix_break_changes_platform
resolved-ref: "0feca6f15042c279ff575c559a3430df917b623d"
url: "https://github.com/Heap-Hop/qr_code_scanner.git"
source: git
version: "0.7.0"
quiver:
dependency: transitive
@ -638,7 +638,7 @@ packages:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.3.0"
url_launcher:
dependency: "direct main"
description:
@ -750,7 +750,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.1"
version: "2.5.2"
xdg_directories:
dependency: transitive
description:
@ -764,7 +764,7 @@ packages:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.1"
version: "5.3.1"
yaml:
dependency: transitive
description:
@ -780,5 +780,5 @@ packages:
source: hosted
version: "0.1.0"
sdks:
dart: ">=2.17.0 <3.0.0"
flutter: ">=2.10.0"
dart: ">=2.17.0-0 <3.0.0"
flutter: ">=3.0.0"

11
flutter/pubspec.yaml
View File

@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.1.10+27
environment:
sdk: ">=2.16.1 <3.0.0"
sdk: ">=2.16.1"
dependencies:
flutter:
@ -46,13 +46,14 @@ dependencies:
settings_ui: ^2.0.2
flutter_breadcrumb: ^1.0.1
http: ^0.13.4
qr_code_scanner: ^0.7.0
qr_code_scanner:
git:
url: https://github.com/Heap-Hop/qr_code_scanner.git
ref: fix_break_changes_platform
zxing2: ^0.1.0
image_picker: ^0.8.5
image: ^3.1.3
flutter_smart_dialog:
git:
url: https://github.com/Heap-Hop/flutter_smart_dialog.git
flutter_smart_dialog: ^4.3.1
flutter_rust_bridge: ^1.30.0
dev_dependencies: