WT 1.1.25+3 flutter 2.8, activate training plan

lib/widgets/app_bar.dart

@@ -6,7 +6,6 @@ import 'package:aitrainer_app/util/app_localization.dart';
 import 'package:aitrainer_app/model/cache.dart';
 import 'package:aitrainer_app/repository/exercise_repository.dart';
 import 'package:aitrainer_app/util/common.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_fonts/google_fonts.dart';

lib/widgets/app_bar_min.dart

@@ -1,7 +1,6 @@
 import 'package:aitrainer_app/bloc/timer/timer_bloc.dart';
 import 'package:aitrainer_app/model/cache.dart';
 import 'package:aitrainer_app/util/common.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_fonts/google_fonts.dart';

lib/widgets/app_bar_progress.dart

@@ -1,6 +1,5 @@
 import 'package:aitrainer_app/bloc/timer/timer_bloc.dart';
 import 'package:aitrainer_app/util/common.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:aitrainer_app/library/liquid_progress_indicator/liquid_linear_progress_indicator.dart';

lib/widgets/bmi_widget.dart

@@ -1,9 +1,7 @@
 import 'package:aitrainer_app/bloc/exercise_new/exercise_new_bloc.dart';
 import 'package:aitrainer_app/util/app_localization.dart';
 import 'package:aitrainer_app/util/trans.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:syncfusion_flutter_gauges/gauges.dart';
 import 'app_bar.dart';

lib/widgets/bmr_widget.dart

@@ -3,9 +3,7 @@ import 'package:aitrainer_app/util/app_localization.dart';
 import 'package:aitrainer_app/model/fitness_state.dart';
 import 'package:aitrainer_app/util/trans.dart';
 import 'package:aitrainer_app/library/dropdown_search/dropdown_search.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'app_bar.dart';
 import 'package:keyboard_actions/keyboard_actions.dart';

lib/widgets/bottom_nav.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:aitrainer_app/model/cache.dart';
 import 'package:aitrainer_app/service/logging.dart';
 import 'package:aitrainer_app/util/common.dart';

lib/widgets/dialog_html.dart

@@ -1,7 +1,6 @@
 import 'package:aitrainer_app/util/trans.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:flutter_html/style.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 // ignore: must_be_immutable

lib/widgets/exercise_save.dart

@@ -11,7 +11,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:keyboard_actions/keyboard_actions.dart';
-import 'package:keyboard_actions/keyboard_actions_config.dart';
 import 'package:stop_watch_timer/stop_watch_timer.dart';
 import 'package:wakelock/wakelock.dart';
 import 'dialog_html.dart';

lib/widgets/home.dart

@@ -9,10 +9,8 @@ import 'package:aitrainer_app/view/login.dart';
 import 'package:aitrainer_app/view/menu_page.dart';
 import 'package:aitrainer_app/widgets/dialog_common.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:upgrader/upgrader.dart';
 import 'loading.dart';

lib/widgets/image_button.dart

@@ -1,7 +1,6 @@
 import 'dart:ui';
 
 import 'package:aitrainer_app/model/cache.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:bloc/bloc.dart';
 import 'package:google_fonts/google_fonts.dart';

lib/widgets/loading.dart

@@ -1,5 +1,4 @@
 import 'package:aitrainer_app/widgets/app_bar_min.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class LoadingScreenMain extends StatelessWidget {

lib/widgets/menu_image.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:aitrainer_app/library/image_cache.dart' as wt;
 import 'package:aitrainer_app/library/transparent_image.dart';
-import 'package:flutter_html/shims/dart_ui_real.dart';
 
 // ignore: must_be_immutable
 class MenuImage extends StatelessWidget {

lib/widgets/menu_page_widget.dart

@@ -1,5 +1,4 @@
 import 'dart:collection';
-import 'dart:ui';
 import 'package:aitrainer_app/bloc/training_plan/training_plan_bloc.dart';
 import 'package:aitrainer_app/model/exercise_ability.dart';
 import 'package:aitrainer_app/bloc/menu/menu_bloc.dart';
@@ -19,9 +18,7 @@ import 'package:aitrainer_app/widgets/dialog_common.dart';
 import 'package:badges/badges.dart';
 import 'package:ezanimation/ezanimation.dart';
 import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -108,15 +105,12 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
   }
 
   Future<void> initDynamicLinks() async {
-    FirebaseDynamicLinks.instance.onLink(onSuccess: (PendingDynamicLinkData? dynamicLink) async {
-      final Uri? deepLink = dynamicLink?.link;
+    FirebaseDynamicLinks.instance.onLink.listen((dynamicLink) {
+      final Uri deepLink = dynamicLink.link;
       print("DeepLink: $deepLink");
-      if (deepLink != null) {
-        // ignore: unawaited_futures
-        final String deepLinkPath = deepLink.path.replaceFirst("/", "");
-        Navigator.pushNamed(context, deepLinkPath);
-      }
-    }, onError: (OnLinkErrorException e) async {
+      final String deepLinkPath = deepLink.path.replaceFirst("/", "");
+      Navigator.pushNamed(context, deepLinkPath);
+    }, onError: (e) async {
       print('onLinkError');
       print(e.message);
     });

lib/widgets/size_widget.dart

@@ -2,9 +2,7 @@ import 'package:aitrainer_app/bloc/exercise_new/exercise_new_bloc.dart';
 import 'package:aitrainer_app/library/custom_icon_icons.dart';
 import 'package:aitrainer_app/model/property.dart';
 import 'package:aitrainer_app/util/trans.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'app_bar.dart';
 import 'input_dialog_widget.dart';

lib/widgets/treeview_parent_widget.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 

lib/widgets/tutorial_widget.dart

@@ -7,7 +7,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:flutter_html/style.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:aitrainer_app/library/super_tooltip.dart';
 
@@ -41,8 +40,11 @@ class TutorialWidget with Trans, Logging {
   }
 
   void explanation(BuildContext context, Widget widget) {
+    final height = MediaQuery.of(context).size.height;
+    print("Height $height");
+
     tooltip = SuperTooltip(
-        top: 120,
+        top: height < 800 ? 60 : 120,
         left: 20,
         right: 20,
         backgroundColor: Colors.black87,