consolidating language constants and using for unknown detection instance

lib/pages/chat/chat_input_row.dart

@@ -3,7 +3,7 @@ import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/it_bar.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/send_button.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';

lib/pangea/choreographer/controllers/choreographer.dart

@@ -5,13 +5,12 @@ import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pangea/choreographer/controllers/alternative_translator.dart';
 import 'package:fluffychat/pangea/choreographer/controllers/igc_controller.dart';
 import 'package:fluffychat/pangea/choreographer/controllers/message_options.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/controllers/subscription_controller.dart';
 import 'package:fluffychat/pangea/enum/assistance_state_enum.dart';
 import 'package:fluffychat/pangea/enum/edit_type.dart';
 import 'package:fluffychat/pangea/models/it_step.dart';
-import 'package:fluffychat/pangea/models/language_detection_model.dart';
 import 'package:fluffychat/pangea/models/representation_content_model.dart';
 import 'package:fluffychat/pangea/models/space_model.dart';
 import 'package:fluffychat/pangea/models/tokens_event_content_model.dart';
@@ -94,63 +93,67 @@ class Choreographer {
   }
 
   Future<void> _sendWithIGC(BuildContext context) async {
-    if (igc.canSendMessage) {
-      final PangeaRepresentation? originalWritten =
-          choreoRecord.includedIT && itController.sourceText != null
-              ? PangeaRepresentation(
-                  langCode: l1LangCode ?? LanguageKeys.unknownLanguage,
-                  text: itController.sourceText!,
-                  originalWritten: true,
-                  originalSent: false,
-                )
-              : null;
+    if (!igc.canSendMessage) {
+      igc.showFirstMatch(context);
+      return;
+    }
 
-      final PangeaRepresentation originalSent = PangeaRepresentation(
-        langCode: langCodeOfCurrentText ?? LanguageKeys.unknownLanguage,
-        text: currentText,
-        originalSent: true,
-        originalWritten: originalWritten == null,
-      );
-      final ChoreoRecord? applicableChoreo =
-          isITandIGCEnabled && igc.igcTextData != null ? choreoRecord : null;
+    final PangeaRepresentation? originalWritten =
+        choreoRecord.includedIT && itController.sourceText != null
+            ? PangeaRepresentation(
+                langCode: l1LangCode ?? LanguageKeys.unknownLanguage,
+                text: itController.sourceText!,
+                originalWritten: true,
+                originalSent: false,
+              )
+            : null;
+    //TODO - confirm that IT is indeed making sure the message is in the user's L1
 
-      // if the message has not been processed to determine its language
-      // then run it through the language detection endpoint. If the detection
-      // confidence is high enough, use that language code as the message's language
-      // to save that pangea representation
-      if (applicableChoreo == null) {
-        final resp = await pangeaController.languageDetection.detectLanguage(
+    // if the message has not been processed to determine its language
+    // then run it through the language detection endpoint. If the detection
+    // confidence is high enough, use that language code as the message's language
+    // to save that pangea representation
+    // TODO - move this to somewhere such that the message can be cleared from the input field
+    // before the language detection is complete. Otherwise, user is going to be waiting
+    // in cases of slow internet or slow language detection
+    final String originalSentLangCode = langCodeOfCurrentText ??
+        (await pangeaController.languageDetection.detectLanguage(
           currentText,
           pangeaController.languageController.userL2?.langCode,
           pangeaController.languageController.userL1?.langCode,
-        );
-        final LanguageDetection? bestDetection = resp.bestDetection();
-        if (bestDetection != null) {
-          originalSent.langCode = bestDetection.langCode;
-        }
-      }
+        ))
+            .bestDetection()
+            .langCode;
 
-      final UseType useType = useTypeCalculator(applicableChoreo);
-      debugPrint("use type in choreographer $useType");
+    final PangeaRepresentation originalSent = PangeaRepresentation(
+      langCode: originalSentLangCode,
+      text: currentText,
+      originalSent: true,
+      originalWritten: originalWritten == null,
+    );
 
-      chatController.send(
-        // PTODO - turn this back on in conjunction with saving tokens
-        // we need to save those tokens as well, in order for exchanges to work
-        // properly. in an exchange, the other user will want
-        // originalWritten: originalWritten,
-        originalSent: originalSent,
-        tokensSent: igc.igcTextData?.tokens != null
-            ? PangeaMessageTokens(tokens: igc.igcTextData!.tokens)
-            : null,
-        //TODO - save originalwritten tokens
-        choreo: applicableChoreo,
-        useType: useType,
-      );
+    // TODO - why does both it and igc need to be enabled for choreo to be applicable?
+    final ChoreoRecord? applicableChoreo =
+        isITandIGCEnabled && igc.igcTextData != null ? choreoRecord : null;
 
-      clear();
-    } else {
-      igc.showFirstMatch(context);
-    }
+    final UseType useType = useTypeCalculator(applicableChoreo);
+    debugPrint("use type in choreographer $useType");
+
+    chatController.send(
+      // PTODO - turn this back on in conjunction with saving tokens
+      // we need to save those tokens as well, in order for exchanges to work
+      // properly. in an exchange, the other user will want
+      // originalWritten: originalWritten,
+      originalSent: originalSent,
+      tokensSent: igc.igcTextData?.tokens != null
+          ? PangeaMessageTokens(tokens: igc.igcTextData!.tokens)
+          : null,
+      //TODO - save originalwritten tokens
+      choreo: applicableChoreo,
+      useType: useType,
+    );
+
+    clear();
   }
 
   _resetDebounceTimer() {
@@ -481,10 +484,17 @@ class Choreographer {
 
   bool get editTypeIsKeyboard => EditType.keyboard == _textController.editType;
 
+  /// If there is applicable igcTextData, return the detected langCode
+  /// Otherwise, if the IT controller is open, return the user's L2 langCode
+  /// This second piece assumes that IT is being used to translate into the user's L2
+  /// and could be spotty. It's a bit of a hack, and should be tested more.
   String? get langCodeOfCurrentText {
     if (igc.detectedLangCode != null) return igc.detectedLangCode!;
 
-    if (itController.isOpen) return l2LangCode!;
+    // TODO - this is a bit of a hack, and should be tested more
+    // we should also check that user has not done customInput
+    if (itController.completedITSteps.isNotEmpty && itController.allCorrect)
+      return l2LangCode!;
 
     return null;
   }

lib/pangea/choreographer/controllers/it_controller.dart

@@ -340,9 +340,6 @@ class ITController {
 
   bool get isLoading => choreographer.isFetching;
 
-  bool get correctChoicesSelected =>
-      completedITSteps.every((ITStep step) => step.isCorrect);
-
   String latestChoiceFeedback(BuildContext context) =>
       completedITSteps.isNotEmpty
           ? completedITSteps.last.choiceFeedback(context)

lib/pangea/choreographer/controllers/message_options.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 
 import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';
 import 'package:fluffychat/pangea/utils/firebase_analytics.dart';
 

lib/pangea/constants/keys.dart

@@ -1,4 +0,0 @@
-class PrefKey {
-  static const lastFetched = 'LAST_FETCHED';
-  static const flags = 'flags';
-}

lib/pangea/constants/language_constants.dart

@@ -0,0 +1,24 @@
+import 'package:fluffychat/pangea/models/language_detection_model.dart';
+
+class LanguageKeys {
+  static const unknownLanguage = "unk";
+  static const mixedLanguage = "mixed";
+  static const defaultLanguage = "en";
+  static const multiLanguage = "multi";
+}
+
+class LanguageLevelType {
+  static List<int> get allInts => [0, 1, 2, 3, 4, 5, 6];
+}
+
+class PrefKey {
+  static const lastFetched = 'p_lang_lastfetched';
+  static const flags = 'p_lang_flag';
+}
+
+final LanguageDetection unknownLanguageDetection = LanguageDetection(
+  langCode: LanguageKeys.unknownLanguage,
+  confidence: 0.5,
+);
+
+const double languageDetectionConfidenceThreshold = 0.95;

lib/pangea/constants/language_keys.dart

@@ -1,6 +0,0 @@
-class LanguageKeys {
-  static const unknownLanguage = "unk";
-  static const mixedLanguage = "mixed";
-  static const defaultLanguage = "en";
-  static const multiLanguage = "multi";
-}

lib/pangea/constants/language_level_type.dart

@@ -1,3 +0,0 @@
-class LanguageLevelType {
-  static List<int> get allInts => [0, 1, 2, 3, 4, 5, 6];
-}

lib/pangea/constants/language_list_keys.dart

@@ -1,4 +0,0 @@
-class PrefKey {
-  static const lastFetched = 'p_lang_lastfetched';
-  static const flags = 'p_lang_flag';
-}

lib/pangea/controllers/language_controller.dart

@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';

lib/pangea/controllers/language_detection_controller.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:fluffychat/pangea/config/environment.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/models/language_detection_model.dart';
 import 'package:fluffychat/pangea/network/urls.dart';
@@ -75,19 +76,16 @@ class LanguageDetectionResponse {
     };
   }
 
-  LanguageDetection? get _bestDetection {
+  LanguageDetection get _bestDetection {
     detections.sort((a, b) => b.confidence.compareTo(a.confidence));
-    return detections.isNotEmpty ? detections.first : null;
+    return detections.firstOrNull ?? unknownLanguageDetection;
   }
 
-  final double _confidenceThreshold = 0.95;
-
-  LanguageDetection? bestDetection({double? threshold}) {
-    threshold ??= _confidenceThreshold;
-    return (_bestDetection?.confidence ?? 0) >= _confidenceThreshold
-        ? _bestDetection!
-        : null;
-  }
+  LanguageDetection bestDetection({double? threshold}) =>
+      _bestDetection.confidence >=
+              (threshold ?? languageDetectionConfidenceThreshold)
+          ? _bestDetection
+          : unknownLanguageDetection;
 }
 
 class _LanguageDetectionCacheItem {

lib/pangea/controllers/language_list_controller.dart

@@ -1,13 +1,12 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';
 import 'package:fluffychat/pangea/repo/language_repo.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:flutter/foundation.dart';
 
-import '../constants/language_list_keys.dart';
 import '../utils/shared_prefs.dart';
 
 class PangeaLanguage {

lib/pangea/controllers/my_analytics_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/constants/local.key.dart';
 import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/controllers/base_controller.dart';

lib/pangea/controllers/user_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:collection/collection.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/constants/model_keys.dart';
 import 'package:fluffychat/pangea/controllers/base_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';

lib/pangea/controllers/word_net_controller.dart

@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:http/http.dart' as http;
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/repo/word_repo.dart';
 import '../models/word_data_model.dart';
 import 'base_controller.dart';

lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart

@@ -4,7 +4,7 @@ import 'dart:developer';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/constants/class_default_values.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/constants/model_keys.dart';
 import 'package:fluffychat/pangea/constants/pangea_room_types.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';

lib/pangea/matrix_event_wrappers/pangea_message_event.dart

@@ -22,7 +22,7 @@ import 'package:matrix/matrix.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import '../../widgets/matrix.dart';
-import '../constants/language_keys.dart';
+import '../constants/language_constants.dart';
 import '../constants/pangea_event_types.dart';
 import '../enum/use_type.dart';
 import '../utils/error_handler.dart';

lib/pangea/matrix_event_wrappers/pangea_representation_event.dart

@@ -12,7 +12,7 @@ import 'package:matrix/src/utils/markdown.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import '../../widgets/matrix.dart';
-import '../constants/language_keys.dart';
+import '../constants/language_constants.dart';
 import '../constants/pangea_event_types.dart';
 import '../models/choreo_record.dart';
 import '../models/representation_content_model.dart';

lib/pangea/models/language_model.dart

@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/pangea/models/space_model.dart

@@ -7,7 +7,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
 import '../constants/class_default_values.dart';
-import '../constants/language_keys.dart';
+import '../constants/language_constants.dart';
 import '../constants/pangea_event_types.dart';
 import 'language_model.dart';
 

lib/pangea/models/user_model.dart

@@ -9,7 +9,7 @@ import 'package:fluffychat/pangea/utils/instructions.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../constants/language_keys.dart';
+import '../constants/language_constants.dart';
 import 'language_model.dart';
 
 PUserModel pUserModelFromJson(String str) =>

lib/pangea/pages/analytics/student_analytics/student_analytics.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/enum/bar_chart_view_enum.dart';
 import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart';

lib/pangea/utils/get_chat_list_item_subtitle.dart

@@ -1,5 +1,5 @@
 import 'package:collection/collection.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/constants/model_keys.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';

lib/pangea/widgets/igc/word_data_card.dart

@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/controllers/contextual_definition_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';

lib/pangea/widgets/space/language_level_dropdown.dart

@@ -1,4 +1,4 @@
-import 'package:fluffychat/pangea/constants/language_level_type.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/utils/language_level_copy.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/pangea/widgets/user_settings/p_language_dialog.dart

@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';

lib/utils/background_push.dart

@@ -24,7 +24,7 @@ import 'dart:io';
 import 'package:fcm_shared_isolate/fcm_shared_isolate.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:fluffychat/pangea/constants/language_keys.dart';
+import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/utils/push_helper.dart';
 import 'package:fluffychat/widgets/fluffy_chat_app.dart';