WearOS improvements & some unit tests

Author: Codel1417

.gitignore

@@ -94,3 +94,7 @@ ios/Runner/GoogleService-Info.plist
 firebase.json
 
 android/app/google-services.json
+
+HiveTest/
+
+.HiveTest/

.run/main.dart.run.xml

@@ -2,8 +2,6 @@
   <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
     <option name="additionalArgs" value="--dart-define=cronetHttpNoPlay=true" />
     <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Run Dart Generator" run_configuration_type="ShConfigurationType" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>

.vscode/settings.json

@@ -4,10 +4,9 @@
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
     "editor.wordBasedSuggestions": "off",
-    "dart.lineLength": 200,
     "[dart]": {
         "editor.rulers": [
-            200
+            80
         ],
         "editor.selectionHighlight": false,
         "editor.tabCompletion": "onlySnippets",
@@ -17,6 +16,4 @@
     "dart.buildRunnerAdditionalArgs": [
         "--delete-conflicting-outputs"
     ],
-    "avdmanager.executable": "c:\\Users\\Floof\\AppData\\Local\\Android\\Sdk\\cmdline-tools\\latest\\bin\\avdmanager.bat",
-    "java.configuration.updateBuildConfiguration": "automatic"
 }

android/wear/src/main/java/com/codel1417/tail_App/presentation/MainActivity.kt

@@ -71,25 +71,23 @@ import java.io.ObjectOutputStream
 
 /** TODO:
  * Show spinner when no data available / loading from app
- * Refresh UI when data updates
  * Move actions / triggers / gear to their own page with horizontal swipe
  * show all actions, not just favorites
  * Theme based on main app colors
- * Watch to App communication
  */
 class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
     CapabilityClient.OnCapabilityChangedListener {
     private var wearData: MutableLiveData<WearData> = MutableLiveData<WearData>(WearData())
 
     override fun onResume() {
         super.onResume()
-        println("onResume()")
+        //println("onResume()")
         Wearable.getDataClient(this).addListener(this)
     }
 
     override fun onPause() {
         super.onPause()
-        println("onPause()")
+        //println("onPause()")
         Wearable.getDataClient(this).removeListener(this)
     }
 
@@ -127,9 +125,9 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
     }
 
     override fun onDataChanged(dataEvents: DataEventBuffer) {
-        println("onDataChanged()")
+        //println("onDataChanged()")
         dataEvents.forEach { event ->
-            println("onDataChanged() ${event.type}")
+            //println("onDataChanged() ${event.type}")
             // DataItem changed
             if (event.type == DataEvent.TYPE_CHANGED) {
                 event.dataItem.also { item ->
@@ -141,7 +139,7 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
 
     private fun getWearDataItem(item: DataItem) {
         try {
-            println("Loading Actions")
+            //println("Loading Actions")
             val gson = Gson()
             // asMap converts the bytes to the java object
             // The flutter library watch_connectivity was built for flutter to flutter, not flutter to compose
@@ -170,6 +168,7 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
                     val capabilityId =         // Find a nearby node or pick one arbitrarily.
                         result.nodes.firstOrNull { it.isNearby }?.id
                             ?: result.nodes.firstOrNull()?.id
+                    //println("Capability ID: ${capabilityId}")
                     if (capabilityId == null) {
                         return@addOnSuccessListener
                     }
@@ -189,7 +188,7 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        println("onCreate()")
+        //println("onCreate()")
         installSplashScreen()
 
         super.onCreate(savedInstanceState)
@@ -204,7 +203,7 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
     //TODO: When app is visible, send a message to update application context
     @Composable
     fun WearApp() {
-        println("WearApp()")
+        //println("WearApp()")
         val context = LocalContext.current
         val state: State<WearData?> = wearData.observeAsState()
 
@@ -370,7 +369,7 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
                                     GearButton(
                                         contentModifier,
                                         it.name,
-                                        it.batteryLevel.toInt(),
+                                        it.batteryLevel,
                                         it.color
                                     )
                                 }
@@ -464,7 +463,7 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
     }
 
     override fun onCapabilityChanged(p0: CapabilityInfo) {
-        println("onCapabilityChanged() ${p0.name} ${p0.nodes}")
+        //println("onCapabilityChanged() ${p0.name} ${p0.nodes}")
         sendMessageToPhone(
             data = WearSendData(
                 capability = "refresh",

lib/Backend/dynamic_config.dart

@@ -30,7 +30,7 @@ abstract class DynamicConfigInfo with _$DynamicConfigInfo {
       "MiTail": "https://thetailcompany.com/fw/mitail.json",
       "minitail": "https://thetailcompany.com/fw/mini.json",
       "EG2": "https://thetailcompany.com/fw/eg",
-      "flutter": "https://thetailcompany.com/fw/flutter"
+      "flutter": "https://thetailcompany.com/fw/flutter",
     })
     Map<String, String> updateURLs,
     @Default(URLs()) URLs urls,
@@ -41,23 +41,15 @@ abstract class DynamicConfigInfo with _$DynamicConfigInfo {
 
 @freezed
 abstract class AppVersion with _$AppVersion {
-  const factory AppVersion({
-    @Default(Version(major: 1, minor: 0, patch: 0)) Version version,
-    @Default("") String changelog,
-    @Default("") String url,
-  }) = _AppVersion;
+  const factory AppVersion({@Default(Version(major: 1, minor: 0, patch: 0)) Version version, @Default("") String changelog, @Default("") String url}) = _AppVersion;
 
   factory AppVersion.fromJson(Map<String, dynamic> json) => _$AppVersionFromJson(json);
 }
 
 @freezed
 abstract class SentryConfig with _$SentryConfig {
-  const factory SentryConfig({
-    @Default(0.5) double tracesSampleRate,
-    @Default(0.5) double profilesSampleRate,
-    @Default(0) double replaySessionSampleRate,
-    @Default(0) double replayOnErrorSampleRate,
-  }) = _SentryConfig;
+  const factory SentryConfig({@Default(0.5) double tracesSampleRate, @Default(0.5) double profilesSampleRate, @Default(0) double replaySessionSampleRate, @Default(0) double replayOnErrorSampleRate}) =
+      _SentryConfig;
 
   factory SentryConfig.fromJson(Map<String, dynamic> json) => _$SentryConfigFromJson(json);
 }
@@ -90,6 +82,12 @@ abstract class URLs with _$URLs {
 
 DynamicConfigInfo? _dynamicConfigInfo;
 
+@visibleForTesting
+void clearDynamicConfigCache() {
+  _dynamicConfigInfo = null;
+  HiveProxy.deleteKey(settings, dynamicConfigJsonString);
+}
+
 Future<DynamicConfigInfo> getDynamicConfigInfo() async {
   if (_dynamicConfigInfo != null) {
     return _dynamicConfigInfo!;
@@ -119,7 +117,10 @@ Future<void> _getRemoteDynamicConfigInfo() async {
   try {
     _dynamicConfigLogger.info("Downloading latest config file");
     // TODO: move to own domain
-    Response<String> response = await dio.get(_dynamicConfigInfo!.urls.dynamicConfigFileUrl, options: Options(contentType: ContentType.json.mimeType, responseType: ResponseType.json));
+    Response<String> response = await dio.get(
+      _dynamicConfigInfo!.urls.dynamicConfigFileUrl,
+      options: Options(contentType: ContentType.json.mimeType, responseType: ResponseType.json),
+    );
     if (response.statusCode! < 400) {
       String jsonData = response.data!;
       // ignore: unused_local_variable

lib/Backend/move_lists_backend.dart

@@ -143,6 +143,11 @@ class MoveLists with ChangeNotifier {
   static final MoveLists instance = MoveLists._internal();
 
   MoveLists._internal() {
+    reload();
+  }
+
+  @visibleForTesting
+  void reload() {
     List<MoveList> results = [];
     try {
       results = HiveProxy.getAll<MoveList>(sequencesBox).toList(growable: true);

lib/Backend/wear_bridge.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:built_collection/built_collection.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:logging/logging.dart';
+import 'package:stream_transform/stream_transform.dart';
 import 'package:synchronized/synchronized.dart';
 import 'package:tail_app/Backend/Bluetooth/known_devices.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
@@ -22,9 +23,7 @@ part 'wear_bridge.g.dart';
 
 final Logger _wearLogger = Logger('Wear');
 final _watch = WatchConnectivity();
-bool _didInitWear = false;
 WearThemeData? wearThemeData;
-Lock _initLock = Lock();
 
 void _watchIncomingMessageListener(Map<String, dynamic> event) {
   _wearLogger.info("Watch Message: $event");
@@ -52,14 +51,12 @@ void _watchIncomingMessageListener(Map<String, dynamic> event) {
   }
 }
 
-Future<void> initWear() async {
-  if (_didInitWear) {
-    return;
-  }
-  _initLock.synchronized(() async {
-    await Future.delayed(const Duration(seconds: 5));
+void initWear()  {
+
     try {
-      _watch.messageStream.listen(_watchIncomingMessageListener);
+      _wearLogger.info("Setting up listeners");
+
+      _watch.messageStream.asBroadcastStream().debounce(Duration(milliseconds: 250)).listen(_watchIncomingMessageListener);
       KnownDevices.instance.addListener(() {
         KnownDevices.instance.state.values.map((e) => e).forEach((element) {
           element.batteryLevel
@@ -73,13 +70,13 @@ Future<void> initWear() async {
             ..removeListener(updateWearData)
             ..addListener(updateWearData);
         });
+
         //react to device pairing
         updateWearData();
       });
     } catch (e, s) {
       _wearLogger.severe("exception setting up Wear $e", e, s);
     }
-  });
 }
 
 Future<bool> isReachable() {
@@ -99,12 +96,12 @@ Future<Map<String, dynamic>> applicationContext() {
 }
 
 Future<void> updateWearData() async {
-  _initLock.synchronized(() async {
     try {
-      await initWear();
       if (!await isPaired()) {
         return; // Don't update wear actions if wear is not supported / no watch is paired
       }
+      _wearLogger.info("Updating watch data");
+
       Iterable<BaseAction> allActions = FavoriteActions.instance.state.map((e) => ActionRegistry.getActionFromUUID(e.actionUUID)).nonNulls;
       BuiltList<Trigger> triggers = TriggerList.instance.state;
       final List<WearActionData> favoriteMap = allActions.map((e) => WearActionData(uuid: e.uuid, name: e.name)).toList();
@@ -138,7 +135,6 @@ Future<void> updateWearData() async {
     } catch (e, s) {
       _wearLogger.severe("Unable to send favorite actions to watch", e, s);
     }
-  });
 }
 
 @freezed

lib/Frontend/pages/move_list.dart

@@ -3,21 +3,19 @@ import 'dart:math';
 import 'package:built_collection/built_collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_joystick/flutter_joystick.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:tail_app/Backend/command_runner.dart';
 import 'package:tail_app/Frontend/Widgets/uwu_text.dart';
-import 'package:tail_app/Frontend/pages/direct_gear_control.dart';
 import 'package:uuid/uuid.dart';
 
-import '../../Backend/Bluetooth/known_devices.dart';
-import '../../Backend/Definitions/Action/base_action.dart';
-import '../../Backend/Definitions/Device/device_definition.dart';
-import '../../Backend/logging_wrappers.dart';
-import '../../Backend/move_lists_backend.dart';
+import 'package:tail_app/Backend/Bluetooth/known_devices.dart';
+import 'package:tail_app/Backend/Definitions/Action/base_action.dart';
+import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
+import 'package:tail_app/Backend/logging_wrappers.dart';
+import 'package:tail_app/Backend/move_lists_backend.dart';
 import '../../Backend/analytics.dart';
-import '../../constants.dart';
+import 'package:tail_app/constants.dart';
 import '../Widgets/device_type_widget.dart';
 import '../Widgets/speed_widget.dart';
 import '../Widgets/tutorial_card.dart';

lib/main.dart

@@ -157,11 +157,18 @@ void initFlutter() {
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); // keeps the splash screen visible
 }
 
+bool _didInitHive = false;
 Future<void> initHive() async {
+  if (_didInitHive) {
+    return;
+  }
   mainLogger.fine("Init Hive");
-
-  final Directory appDir = await getApplicationSupportDirectory();
-  Hive.init(appDir.path);
+  if (Platform.isAndroid || Platform.isIOS) {
+    final Directory appDir = await getApplicationSupportDirectory();
+    Hive.init(appDir.path);
+  } else {
+    Hive.init(Directory(".HiveTest").path);
+  }
 
   //Hive Type ID 1
   if (!Hive.isAdapterRegistered(BaseStoredDeviceAdapter().typeId)) {
@@ -229,6 +236,8 @@ Future<void> initHive() async {
   await Hive.openBox<AudioAction>(audioActionsBox);
   await Hive.openBox<MoveList>(sequencesBox);
   await Hive.openBox<BaseStoredDevice>(devicesBox);
+
+  _didInitHive = true;
 }
 
 class TailApp extends ConsumerWidget {

pubspec.lock

@@ -1809,7 +1809,7 @@ packages:
     source: hosted
     version: "2.1.4"
   stream_transform:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: stream_transform
       sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871