diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72499882..57a5ab9e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
fetch-depth: 0
- uses: subosito/flutter-action@v2
with:
- flutter-version: '3.19.2'
+ flutter-version: '3.32.0'
cache: false
- name: Run build script
id: build
@@ -51,7 +51,7 @@ jobs:
java-version: '17'
- uses: subosito/flutter-action@v2
with:
- flutter-version: '3.19.2'
+ flutter-version: '3.32.0'
cache: false
- name: Run build script
id: build
diff --git a/.run/Generate l10n.run.xml b/.run/Generate l10n.run.xml
index 3429625e..e958f10e 100644
--- a/.run/Generate l10n.run.xml
+++ b/.run/Generate l10n.run.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/.run/Run Dart Generator.run.xml b/.run/Run Dart Generator.run.xml
index a40667dd..30c49325 100644
--- a/.run/Run Dart Generator.run.xml
+++ b/.run/Run Dart Generator.run.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/lib/Backend/Bluetooth/bluetooth_manager_plus.dart b/lib/Backend/Bluetooth/bluetooth_manager_plus.dart
index 5b3860a3..834e30d1 100644
--- a/lib/Backend/Bluetooth/bluetooth_manager_plus.dart
+++ b/lib/Backend/Bluetooth/bluetooth_manager_plus.dart
@@ -6,7 +6,6 @@ import 'package:cross_platform/cross_platform.dart';
import 'package:flutter/material.dart';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:flutter_foreground_service/flutter_foreground_service.dart';
-import 'package:fluttertoast/fluttertoast.dart';
import 'package:logging/logging.dart' as log;
import 'package:permission_handler/permission_handler.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -95,11 +94,6 @@ Future initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
}
// The timer used for the time value on the battery level graph
statefulDevice.stopWatch.start();
- await Fluttertoast.showToast(
- msg: "${statefulDevice.baseStoredDevice.name} has ${event.connectionState.name}",
- toastLength: Toast.LENGTH_SHORT,
- gravity: ToastGravity.CENTER,
- );
isAnyGearConnected.value = true;
if (SentryHive.box(settings).get(keepAwake, defaultValue: keepAwakeDefault)) {
_bluetoothPlusLogger.fine('Enabling wakelock');
@@ -109,8 +103,9 @@ Future initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
//start foreground service on device connected. Library handles duplicate start calls
_bluetoothPlusLogger.fine('Requesting notification permission');
_bluetoothPlusLogger.finer('Requesting notification permission result${await Permission.notification.request()}'); // Used only for Foreground service
- ForegroundServiceHandler.notification.setPriority(AndroidNotificationPriority.LOW);
- ForegroundServiceHandler.notification.setTitle("Gear Connected");
+ await ForegroundServiceHandler.notification.setPriority(AndroidNotificationPriority.LOW);
+ await ForegroundServiceHandler.setContinueRunningAfterAppKilled(false);
+ await ForegroundServiceHandler.notification.setTitle("Gear Connected");
_bluetoothPlusLogger.fine('Starting foreground service');
ForegroundService().start();
}
diff --git a/lib/main.dart b/lib/main.dart
index 20e29ed8..b04c7d9b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,7 +3,6 @@ import 'dart:io';
import 'dart:ui';
import 'package:feedback_sentry/feedback_sentry.dart';
-import 'package:flex_color_scheme/flex_color_scheme.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -192,28 +191,24 @@ class TailApp extends StatelessWidget {
ThemeData buildTheme(Brightness brightness, Color color) {
if (brightness == Brightness.light) {
- return FlexThemeData.light(
+ return ThemeData(
colorScheme: ColorScheme.fromSeed(
brightness: Brightness.light,
seedColor: color,
primary: color,
),
- // Use very subtly themed app bar elevation in light mode.
- appBarElevation: 0.5,
- useMaterial3: true,
+ appBarTheme: const AppBarTheme(elevation: 0.5),
// We use the nicer Material-3 Typography in both M2 and M3 mode.
typography: Typography.material2021(platform: defaultTargetPlatform),
);
} else {
- return FlexThemeData.dark(
+ return ThemeData(
colorScheme: ColorScheme.fromSeed(
brightness: Brightness.dark,
seedColor: color,
primary: color,
),
- // Use a bit more themed elevated app bar in dark mode.
- appBarElevation: 2,
- useMaterial3: true,
+ appBarTheme: const AppBarTheme(elevation: 2),
// We use the nicer Material-3 Typography in both M2 and M3 mode.
typography: Typography.material2021(platform: defaultTargetPlatform),
);
diff --git a/pubspec.lock b/pubspec.lock
index 753d9be1..a25306a3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -502,26 +502,18 @@ packages:
dependency: "direct main"
description:
name: flex_color_picker
- sha256: "5c846437069fb7afdd7ade6bf37e628a71d2ab0787095ddcb1253bf9345d5f3a"
+ sha256: "31b27677d8d8400e4cff5edb3f189f606dd964d608779b6ae1b7ddad37ea48c6"
url: "https://pub.dev"
source: hosted
- version: "3.4.1"
- flex_color_scheme:
- dependency: "direct main"
- description:
- name: flex_color_scheme
- sha256: "32914024a4f404d90ff449f58d279191675b28e7c08824046baf06826e99d984"
- url: "https://pub.dev"
- source: hosted
- version: "7.3.1"
+ version: "3.5.0"
flex_seed_scheme:
dependency: transitive
description:
name: flex_seed_scheme
- sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01"
+ sha256: fb66cdb8ca89084e79efcad2bc2d9deb144666875116f08cdd8d9f8238c8b3ab
url: "https://pub.dev"
source: hosted
- version: "1.5.0"
+ version: "2.0.0"
flutter:
dependency: "direct main"
description: flutter
@@ -548,10 +540,10 @@ packages:
dependency: "direct main"
description:
name: flutter_blue_plus
- sha256: "82ee69af5f9a4d9c4c61b1090698f9935c94cbedf98b229aadb310f31bf313ba"
+ sha256: c762a694c2f67b1f492ef19ead2a30ed3254650bafd852cb8933823d13d7c89f
url: "https://pub.dev"
source: hosted
- version: "1.32.6"
+ version: "1.32.7"
flutter_driver:
dependency: transitive
description: flutter
@@ -562,8 +554,8 @@ packages:
description:
path: "packages/flutter_foreground_service"
ref: HEAD
- resolved-ref: "1a09f176126db5fdbcced77b9539768c8e602bf5"
- url: "https://github.com/cph-cachet/flutter-plugins"
+ resolved-ref: "158612ec6bd8ba30774b1f0a5b0dab0994c19ca1"
+ url: "https://github.com/Codel1417/flutter-plugins"
source: git
version: "0.4.1"
flutter_joystick:
@@ -687,10 +679,10 @@ packages:
dependency: "direct main"
description:
name: flutter_screen_lock
- sha256: f8e504aa0e5fe61ea13b66692ecdec3e8761118173b51c9b3b5518b8e2911e5b
+ sha256: "5c09314747a70d8e1259a1d787f49f4f29d6eae224cd9b2f045e513e8408cbcc"
url: "https://pub.dev"
source: hosted
- version: "9.0.2"
+ version: "9.0.3"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -701,14 +693,6 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
- fluttertoast:
- dependency: "direct main"
- description:
- name: fluttertoast
- sha256: "81b68579e23fcbcada2db3d50302813d2371664afe6165bc78148050ab94bf66"
- url: "https://pub.dev"
- source: hosted
- version: "8.2.5"
freezed_annotation:
dependency: transitive
description:
@@ -721,10 +705,10 @@ packages:
dependency: transitive
description:
name: frontend_server_client
- sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+ sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
url: "https://pub.dev"
source: hosted
- version: "3.2.0"
+ version: "4.0.0"
fuchsia_remote_debug_protocol:
dependency: transitive
description: flutter
@@ -892,10 +876,10 @@ packages:
dependency: "direct dev"
description:
name: intl_translation
- sha256: ce26a8371d7527d3cb5c78503ccd5f0b99faa528229d684d5e9192adcb4353ab
+ sha256: b858d88b569f3c529e992ba7186aa495f3e862897df60edb932563c619943610
url: "https://pub.dev"
source: hosted
- version: "0.19.0"
+ version: "0.20.0"
introduction_screen:
dependency: "direct main"
description:
@@ -948,26 +932,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
- sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+ sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
- version: "10.0.0"
+ version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
- sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+ sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
- version: "2.0.1"
+ version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
- sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+ sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
- version: "2.0.1"
+ version: "3.0.1"
lints:
dependency: transitive
description:
@@ -1020,10 +1004,10 @@ packages:
dependency: transitive
description:
name: meta
- sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+ sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
- version: "1.11.0"
+ version: "1.12.0"
mime:
dependency: transitive
description:
@@ -1644,26 +1628,26 @@ packages:
dependency: transitive
description:
name: test
- sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
+ sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
url: "https://pub.dev"
source: hosted
- version: "1.24.9"
+ version: "1.25.2"
test_api:
dependency: transitive
description:
name: test_api
- sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+ sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
- version: "0.6.1"
+ version: "0.7.0"
test_core:
dependency: transitive
description:
name: test_core
- sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
+ sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
url: "https://pub.dev"
source: hosted
- version: "0.5.9"
+ version: "0.6.0"
timezone:
dependency: transitive
description:
@@ -1804,10 +1788,10 @@ packages:
dependency: transitive
description:
name: vm_service
- sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
- version: "13.0.0"
+ version: "14.2.1"
wakelock_plus:
dependency: "direct main"
description:
@@ -1876,10 +1860,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+ sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
url: "https://pub.dev"
source: hosted
- version: "5.5.0"
+ version: "5.5.1"
win32_registry:
dependency: transitive
description:
@@ -1913,5 +1897,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
- dart: ">=3.3.0 <4.0.0"
- flutter: ">=3.19.0"
+ dart: ">=3.4.0 <4.0.0"
+ flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 09711f42..3c675497 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,13 +19,13 @@ dependencies:
cross_platform: ^3.0.1
flutter_riverpod: ^2.5.1
logging: ^1.2.0
- flutter_blue_plus: ^1.32.6
+ flutter_blue_plus: ^1.32.7
go_router: ^14.1.1
vector_math: ^2.1.4 # used for joystick
collection: ^1.18.0
flutter_foreground_service: # Needs gradle namespace
git:
- url: https://github.com/cph-cachet/flutter-plugins
+ url: https://github.com/Codel1417/flutter-plugins
path: packages/flutter_foreground_service
package_info_plus: ^8.0.0
intl: #pinned to flutter version
@@ -44,7 +44,6 @@ dependencies:
#tivy: ^0.1.1
circular_buffer: ^0.11.0 # Used for serial console
- fluttertoast: ^8.2.5
back_button_interceptor: ^7.0.3 # for rejecting the back button in some places due to flutter/Go Router bugs
riverpod_annotation: ^2.3.5
device_info_plus: ^10.1.0
@@ -54,15 +53,14 @@ dependencies:
ref: fd87e9b8f0d5ed909e929388244456f72b9b63c7
# Widgets / UI
- flutter_screen_lock: ^9.0.2 # used to hide dev mode toggle
+ flutter_screen_lock: ^9.0.3 # used to hide dev mode toggle
introduction_screen: ^3.1.14
lottie: ^3.1.1
- flex_color_picker: ^3.4.1
+ flex_color_picker: ^3.5.0
flutter_adaptive_scaffold: ^0.1.10+2
animate_do: ^3.3.4
fl_chart: ^0.68.0
chart_sparkline: ^1.0.15+1 # used for the move easing visual
- flex_color_scheme: ^7.3.1
pdfx: ^2.6.0
flutter_joystick: ^0.0.4
multi_value_listenable_builder: ^0.0.2
@@ -174,4 +172,4 @@ flutter_native_splash:
color_dark: "#0573a4"
dependency_overrides:
intl: any
- device_info_plus: any
\ No newline at end of file
+ device_info_plus: any