diff --git a/lib/backend/analytics/frederic_analytics_service.dart b/lib/backend/analytics/frederic_analytics_service.dart
index 03f0615..7d0bb88 100644
--- a/lib/backend/analytics/frederic_analytics_service.dart
+++ b/lib/backend/analytics/frederic_analytics_service.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:frederic/backend/util/frederic_profiler.dart';
 import 'package:frederic/theme/frederic_theme.dart';
 
@@ -114,7 +113,7 @@ class UmamiAnalyticsService extends FredericAnalyticsService {
         "referrer": "",
         "language": Platform.localeName,
         "screen":
-            '${MediaQueryData.fromView(WidgetsBinding.instance.window).size.width.toInt()}x${MediaQueryData.fromView(WidgetsBinding.instance.window).size.height.toInt()}',
+            '${PlatformDispatcher.instance.displays.first.size.width.toInt()}x${PlatformDispatcher.instance.displays.first.size.height.toInt()}',
         "title": name.split('/').last,
         "url": "/" + name,
         "website": trackingID
diff --git a/lib/widgets/charts/activity_heatmap_chart_segment.dart b/lib/widgets/charts/activity_heatmap_chart_segment.dart
index 9ed7703..3eff7f9 100644
--- a/lib/widgets/charts/activity_heatmap_chart_segment.dart
+++ b/lib/widgets/charts/activity_heatmap_chart_segment.dart
@@ -11,7 +11,8 @@ class ActivityHeatmapChartSegment extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    double scaleFactor = MediaQuery.of(context).textScaleFactor;
+    //TODO: see if this still works correctly
+    double scaleFactor = MediaQuery.of(context).textScaler.scale(1);
 
     double chartHeight = 216;
     if (scaleFactor > 1.14) chartHeight = 224;
diff --git a/lib/widgets/edit_workout_screen/weekday_slider_day_card.dart b/lib/widgets/edit_workout_screen/weekday_slider_day_card.dart
index 3950782..1b7c0e4 100644
--- a/lib/widgets/edit_workout_screen/weekday_slider_day_card.dart
+++ b/lib/widgets/edit_workout_screen/weekday_slider_day_card.dart
@@ -41,8 +41,8 @@ class WeekDaysSliderDayCard extends StatelessWidget {
                 color: Colors.transparent,
                 child: buildContents(context, false, true, false)));
       },
-      onAccept: (data) {
-        onSwap?.call(data, dayIndex);
+      onAcceptWithDetails: (data) {
+        onSwap?.call(data.data, dayIndex);
       },
     );
   }
diff --git a/lib/widgets/login_screen/authenticate_with_email_button.dart b/lib/widgets/login_screen/authenticate_with_email_button.dart
index ebc173a..04a6388 100644
--- a/lib/widgets/login_screen/authenticate_with_email_button.dart
+++ b/lib/widgets/login_screen/authenticate_with_email_button.dart
@@ -9,7 +9,7 @@ import 'package:frederic/misc/ExtraIcons.dart';
 import 'package:frederic/screens/forgot_password_screen.dart';
 import 'package:frederic/widgets/standard_elements/frederic_button.dart';
 import 'package:frederic/widgets/standard_elements/frederic_text_field.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class AuthenticateWithEmailButton extends StatefulWidget {
   AuthenticateWithEmailButton(
@@ -135,7 +135,7 @@ class _AuthenticateWithEmailButtonState
                               .tr(),
                           GestureDetector(
                             onTap: () {
-                              launch(widget.termsAndContidionsURL);
+                              launchUrlString(widget.termsAndContidionsURL);
                             },
                             child: Text('login.agree_tc_2',
                                     style: TextStyle(
diff --git a/pubspec.yaml b/pubspec.yaml
index c94bc45..fbacfab 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -54,7 +54,7 @@ dependencies:
   animations: ^2.0.8
   fluttertoast: ^8.2.2
   image_picker: ^1.0.4
-  url_launcher: ^6.1.14
+  url_launcher: ^6.2.5
   social_share: ^2.3.1
   system_theme: ^2.3.1
   auto_size_text: ^3.0.0