Reset pointer on app hide, see #280

Author: CodeDoctorDE

app/lib/cubits/current_index.dart

@@ -428,4 +428,8 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
   void removeButtons() {
     emit(state.copyWith(buttons: null));
   }
+
+  void resetInput() {
+    emit(state.copyWith(buttons: null, pointers: []));
+  }
 }

app/lib/dialogs/introduction/start.dart

@@ -6,8 +6,8 @@ import 'package:butterfly/models/document.dart';
 import 'package:butterfly/models/template.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:go_router/go_router.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 
 import '../../api/format_date_time.dart';
@@ -164,7 +164,6 @@ class _CreateStartViewState extends State<_CreateStartView> {
                                   createdAt: DateTime.now(),
                                 );
 
-                                bloc.clearHistory();
                                 transformCubit.reset();
                                 currentIndexCubit.reset(document);
                                 bloc.emit(DocumentLoadSuccess(document,
@@ -175,6 +174,7 @@ class _CreateStartViewState extends State<_CreateStartView> {
                                                 ''),
                                     currentIndexCubit: currentIndexCubit,
                                     settingsCubit: settingsCubit));
+                                bloc.clearHistory();
                                 await bloc.load();
                               });
                         },

app/lib/main.dart

@@ -25,7 +25,7 @@ import 'setup.dart' if (dart.library.html) 'setup_web.dart';
 import 'theme/manager.dart';
 import 'views/main.dart';
 
-const kFileVersion = 6;
+const kFileVersion = 5;
 Future<void> main([List<String> args = const []]) async {
   WidgetsFlutterBinding.ensureInitialized();
 

app/lib/views/view.dart

@@ -21,7 +21,8 @@ class MainViewViewport extends StatefulWidget {
 
 enum _MouseState { normal, inverse, scale }
 
-class _MainViewViewportState extends State<MainViewViewport> {
+class _MainViewViewportState extends State<MainViewViewport>
+    with WidgetsBindingObserver {
   double size = 1.0;
   GlobalKey paintKey = GlobalKey();
   _MouseState _mouseState = _MouseState.normal;
@@ -43,6 +44,15 @@ class _MainViewViewportState extends State<MainViewViewport> {
     super.dispose();
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      context.read<DocumentBloc>().refresh();
+    } else {
+      context.read<CurrentIndexCubit>().resetInput();
+    }
+  }
+
   void _handleKey(RawKeyEvent event) {
     if (event.data.isShiftPressed) {
       _mouseState = _MouseState.inverse;

app/pubspec.lock

@@ -315,7 +315,7 @@ packages:
       name: espresso
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+3"
+    version: "0.2.0+4"
   fake_async:
     dependency: transitive
     description:
@@ -357,7 +357,14 @@ packages:
       name: flex_color_scheme
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.0"
+    version: "6.0.0"
+  flex_seed_scheme:
+    dependency: transitive
+    description:
+      name: flex_seed_scheme
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -1262,5 +1269,5 @@ packages:
     source: hosted
     version: "0.1.0"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=2.18.0 <3.0.0"
+  flutter: ">=3.3.0"

app/pubspec.yaml

@@ -41,7 +41,7 @@ dependencies:
   camera: ^0.10.0+1
   camera_windows: ^0.2.1+1
   window_manager: ^0.2.7
-  flex_color_scheme: ^5.1.0
+  flex_color_scheme: ^6.0.0
   freezed_annotation: ^2.1.0
   json_annotation: ^4.6.0
   path: ^1.8.1
@@ -70,7 +70,7 @@ dev_dependencies:
   freezed: ^2.1.0+1
   build_runner: ^2.2.0
   json_serializable: ^6.3.1
-  espresso: ^0.2.0+3
+  espresso: ^0.2.0+4
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

fastlane/metadata/android/en-US/changelogs/42.txt

@@ -0,0 +1,8 @@
+* Add temporary painter
+* Add new painters
+  * Hand
+  * Undo
+  * Redo
+* Remove hand, undo, redo buttons from general gui
+* Improve UI and UX problems ([#280](https://github.com/LinwoodCloud/Butterfly/issues/280))
+  * Reset pointer on app hide