Merge branch 'master' into dependabot/pub/flutter_lints-6.0.0

Author: Codel1417

.github/actions/build_android/action.yml

@@ -46,11 +46,6 @@ runs:
       run: echo -n "$ANDROID_KEY_JKS" | base64 -d > ./android/tailCo.jks
       env:
         ANDROID_KEY_JKS: ${{ inputs.android-key-jks }}
-    - name: Copy App icon to wear project
-      shell: bash
-      run: |
-        cp -rfv ./android/app/src/main/res/drawable* ./android/wear/src/main/res/
-        cp -rfv ./android/app/src/main/res/mipmap* ./android/wear/src/main/res/
     - name: Build APK
       if: inputs.build-mode == 'apk'
       shell: bash
@@ -75,9 +70,6 @@ runs:
         SENTRY_PROJECT: ${{ inputs.sentry-project }}
         SENTRY_DSN: ${{ inputs.sentry-dsn }}
         SENTRY_URL: ${{ inputs.sentry-url }}
-    - name: list dependencies
-      shell: bash
-      run: cd android && ./gradlew app:dependencies --configuration releaseCompileClasspath
     - name: Rename APK
       shell: bash
       if: inputs.build-mode == 'apk'

.github/actions/pre_build/action.yml

@@ -25,6 +25,3 @@ runs:
     - name: Generate dart .g files
       shell: bash
       run: dart pub run build_runner build --delete-conflicting-outputs
-    - name: list dependencies
-      shell: bash
-      run: flutter pub deps --no-dev

.github/actions/setup_build/action.yml

@@ -9,7 +9,7 @@ inputs:
     default: "zulu"
   flutter-version:
     description: "Flutter Version"
-    default: "3.29.1"
+    default: "3.32.4"
   ruby-version:
     description: "Ruby Version"
     default: "3.4"

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
         uses: ./.github/actions/version
       - name: Download artifact
         id: download-artifact
-        uses: dawidd6/action-download-artifact@v10
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: build.yml
           workflow_conclusion: success

android/app/build.gradle

@@ -103,7 +103,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.21"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.0"
     testImplementation "junit:junit:4.13.2"
     // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "io.sentry.android.gradle" version "5.7.0" apply false
+    id "io.sentry.android.gradle" version "5.8.0" apply false
     id "org.jetbrains.kotlin.android" version "2.1.21" apply false
     id "com.android.application" version '8.10.1' apply false
     id 'com.google.gms.google-services' version '4.4.2' apply false

assets/CosHub BT.png

@@ -56,6 +56,9 @@ class PlausibleDio extends Plausible {
     props['App Version'] = (await PackageInfo.fromPlatform()).version;
     props['App Build'] = (await PackageInfo.fromPlatform()).buildNumber;
     props['Locale'] = Platform.localeName;
+    props['UwU Enabled'] = HiveProxy.getOrDefault(settings, uwuTextEnabled, defaultValue: uwuTextEnabledDefault).toString();
+    props['Marketing Notifications Enabled'] = HiveProxy.getOrDefault(settings, marketingNotificationsEnabled, defaultValue: marketingNotificationsEnabledDefault).toString();
+
     try {
       props['Has Watch'] = (await isPaired()).toString();
     } catch (e) {

lib/Backend/plausible_dio.dart

@@ -9,6 +9,7 @@ import 'package:tail_app/Backend/Bluetooth/bluetooth_manager.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
 import 'package:tail_app/Backend/device_registry.dart';
 import 'package:tail_app/Backend/sensors.dart';
+import 'package:tail_app/Frontend/Widgets/uwu_text.dart';
 import 'package:tail_app/Frontend/translation_string_definitions.dart';
 import 'package:watch_connectivity/watch_connectivity.dart';
 
@@ -162,11 +163,11 @@ Future<void> updateWearData(Ref ref) async {
     ref.watch(getAvailableGearProvider);
 
     final WearLocalizationData localizationData = WearLocalizationData(
-      triggersPage: triggersPage(),
-      actionsPage: watchFavoriteActionsTitle(),
-      favoriteActionsDescription: watchFavoriteActionsNoFavoritesTip(),
-      knownGear: watchKnownGearTitle(),
-      watchKnownGearNoGearPairedTip: watchKnownGearNoGearPairedTip(),
+      triggersPage: convertToUwU(triggersPage()),
+      actionsPage: convertToUwU(watchFavoriteActionsTitle()),
+      favoriteActionsDescription: convertToUwU(watchFavoriteActionsNoFavoritesTip()),
+      knownGear: convertToUwU(watchKnownGearTitle()),
+      watchKnownGearNoGearPairedTip: convertToUwU(watchKnownGearNoGearPairedTip()),
     );
     final WearData wearData = WearData(
       favoriteActions: favoriteMap,

lib/Backend/wear_bridge.dart

@@ -227,7 +227,9 @@ class _ManageGearState extends ConsumerState<ManageGear> {
                     TextButton(
                       onPressed: () {
                         setState(() {
-                          ref.read(commandQueueProvider(device!).notifier).addCommand(BluetoothMessage(message: "SHUTDOWN", priority: Priority.high, type: CommandType.system, timestamp: DateTime.now()));
+                          ref
+                              .read(commandQueueProvider(device!).notifier)
+                              .addCommand(BluetoothMessage(message: "SHUTDOWN", priority: Priority.high, type: CommandType.system, timestamp: DateTime.now()));
                         });
                         Navigator.pop(context);
                       },
@@ -485,7 +487,7 @@ class ManageGearBatteryGraph extends StatelessWidget {
               builder: (context, value, child) {
                 return LineChart(
                   LineChartData(
-                    titlesData: const FlTitlesData(
+                    titlesData: FlTitlesData(
                       rightTitles: AxisTitles(
                         sideTitles: SideTitles(
                           showTitles: false,
@@ -495,10 +497,10 @@ class ManageGearBatteryGraph extends StatelessWidget {
                         sideTitles: SideTitles(showTitles: false),
                       ),
                       leftTitles: AxisTitles(
-                        axisNameWidget: Text('Battery'),
+                        axisNameWidget: Text(convertToUwU('Battery')),
                       ),
                       bottomTitles: AxisTitles(
-                        axisNameWidget: Text('Time'),
+                        axisNameWidget: Text(convertToUwU('Time')),
                         sideTitles: SideTitles(showTitles: true),
                       ),
                     ),
@@ -508,7 +510,16 @@ class ManageGearBatteryGraph extends StatelessWidget {
                     maxY: 100,
                     minX: 0,
                     maxX: device.batlevels.isNotEmpty ? device.batlevels.last.x : 1,
-                    lineBarsData: [LineChartBarData(spots: device.batlevels, color: Theme.of(context).colorScheme.primary, dotData: const FlDotData(show: false), isCurved: true, curveSmoothness: 0.1, preventCurveOverShooting: true, show: device.batlevels.isNotEmpty)],
+                    lineBarsData: [
+                      LineChartBarData(
+                          spots: device.batlevels,
+                          color: Theme.of(context).colorScheme.primary,
+                          dotData: const FlDotData(show: false),
+                          isCurved: true,
+                          curveSmoothness: 0.1,
+                          preventCurveOverShooting: true,
+                          show: device.batlevels.isNotEmpty)
+                    ],
                   ),
                 );
               },
@@ -943,11 +954,11 @@ class _ManageGearHomePositionState extends ConsumerState<ManageGearHomePosition>
   @override
   Widget build(BuildContext context) {
     return ExpansionTile(
-      title: Text(manageGearHomePositionTitle()),
-      subtitle: Text(manageGearHomePositionDescription()),
+      title: Text(convertToUwU(manageGearHomePositionTitle())),
+      subtitle: Text(convertToUwU(manageGearHomePositionDescription())),
       children: [
         ListTile(
-          title: Text(sequencesEditLeftServo()),
+          title: Text(convertToUwU(sequencesEditLeftServo())),
           subtitle: Slider(
             value: widget.device.baseStoredDevice.leftHomePosition.toDouble(),
             label: widget.device.baseStoredDevice.leftHomePosition.toString(),
@@ -963,7 +974,7 @@ class _ManageGearHomePositionState extends ConsumerState<ManageGearHomePosition>
           ),
         ),
         ListTile(
-          title: Text(sequencesEditRightServo()),
+          title: Text(convertToUwU(sequencesEditRightServo())),
           subtitle: Slider(
             value: widget.device.baseStoredDevice.rightHomePosition.toDouble(),
             label: widget.device.baseStoredDevice.rightHomePosition.toString(),
@@ -983,7 +994,9 @@ class _ManageGearHomePositionState extends ConsumerState<ManageGearHomePosition>
   }
 
   void updateHomePosition() {
-    Move move = Move.move(leftServo: (widget.device.baseStoredDevice.leftHomePosition.clamp(0, 8).toDouble() * 16).clamp(0, 127), rightServo: (widget.device.baseStoredDevice.rightHomePosition.clamp(0, 8).toDouble() * 16).clamp(0, 127));
+    Move move = Move.move(
+        leftServo: (widget.device.baseStoredDevice.leftHomePosition.clamp(0, 8).toDouble() * 16).clamp(0, 127),
+        rightServo: (widget.device.baseStoredDevice.rightHomePosition.clamp(0, 8).toDouble() * 16).clamp(0, 127));
     generateMoveCommand(move, widget.device, CommandType.direct, priority: Priority.high);
     BluetoothMessage bluetoothMessage = BluetoothMessage(message: "SETHOME", timestamp: DateTime.now(), responseMSG: "OK", priority: Priority.high);
     ref.read(commandQueueProvider(widget.device).notifier).addCommand(bluetoothMessage);