Fix merging of develop branch

LinwoodDev · Sep 10, 2022 · 8cd83f1 · 8cd83f1 · vercel · Sep 10, 2022
1 parent 23b4a95
commit 8cd83f1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/app/lib/cubits/current_index.dart b/app/lib/cubits/current_index.dart
@@ -363,5 +363,9 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
         location: location ?? state.location, saved: saved ?? state.saved));
   }
 
-  void resetInput() {}
+  void resetInput() {
+    state.temporaryHandler?.resetInput();
+    state.handler.resetInput();
+    emit(state.copyWith(pointers: []));
+  }
 }
diff --git a/app/lib/handlers/area.dart b/app/lib/handlers/area.dart
@@ -21,7 +21,7 @@ class AreaHandler extends Handler<AreaPainter> {
       ];
 
   @override
-  void resetInput(DocumentBloc bloc) => currentRect = null;
+  void resetInput() => currentRect = null;
 
   @override
   void onPointerDown(

diff --git a/app/lib/handlers/handler.dart b/app/lib/handlers/handler.dart
@@ -82,6 +82,8 @@ abstract class Handler<T> {
   void onLongPressEnd(
       Size viewportSize, BuildContext context, LongPressEndDetails details) {}
 
+  void resetInput() {}
+
   int? getColor(DocumentBloc bloc) => null;
 
   T? setColor(DocumentBloc bloc, int color) => null;

diff --git a/app/lib/handlers/shape.dart b/app/lib/handlers/shape.dart
@@ -17,7 +17,7 @@ class ShapeHandler extends Handler {
   }
 
   @override
-  void resetInput(DocumentBloc bloc) {
+  void resetInput() {
     elements.clear();
     submittedElements.clear();
   }

diff --git a/app/lib/views/view.dart b/app/lib/views/view.dart
@@ -178,7 +178,6 @@ class _MainViewViewportState extends State<MainViewViewport>
                 },
                 onPointerDown: (PointerDownEvent event) {
                   cubit.addPointer(event.pointer);
-                  final bloc = context.read<DocumentBloc>();
                   if (event.kind == PointerDeviceKind.stylus &&
                       event.buttons == kPrimaryStylusButton) {
                     cubit.changeTemporaryHandler(

diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt
@@ -1,3 +1,3 @@
 * Fix position and size issues when moving elements
 * Fix gesture issues on area and shape painter and area change problem
-* 
+* Reset pointer on app hide, see #280