Merge pull request #396 from pangeachat/igc-tweaks

Igc-tweaks

assets/l10n/intl_en.arb

@@ -4010,9 +4010,9 @@
   "wordsPerMinute": "Words per minute",
   "autoIGCToolName": "Run Language Assistance Automatically",
   "autoIGCToolDescription": "Automatically run language assistance after typing messages",
-  "runGrammarCorrection": "Run grammar correction",
+  "runGrammarCorrection": "Check message",
   "grammarCorrectionFailed": "Issues to address",
-  "grammarCorrectionComplete": "Grammar correction complete",
+  "grammarCorrectionComplete": "Looks good!",
   "leaveRoomDescription": "The chat will be moved to the archive. Other users will be able to see that you have left the chat.",
   "archiveSpaceDescription": "All chats within this space will be moved to the archive for yourself and other non-admin users.",
   "leaveSpaceDescription": "All chats within this space will be moved to the archive. Other users will be able to see that you have left the space.",

assets/l10n/intl_es.arb

@@ -4609,9 +4609,9 @@
   "enterNumber": "Introduzca un valor numérico entero.",
   "autoIGCToolName": "Ejecutar automáticamente la asistencia lingüística",
   "autoIGCToolDescription": "Ejecutar automáticamente la asistencia lingüística después de escribir mensajes",
-  "runGrammarCorrection": "Corregir la gramática",
+  "runGrammarCorrection": "Comprobar mensaje",
   "grammarCorrectionFailed": "Cuestiones a tratar",
-  "grammarCorrectionComplete": "Corrección gramatical completa",
+  "grammarCorrectionComplete": "¡Se ve bien!",
   "leaveRoomDescription": "El chat se moverá al archivo. Los demás usuarios podrán ver que has abandonado el chat.",
   "archiveSpaceDescription": "Todos los chats de este espacio se moverán al archivo para ti y otros usuarios que no sean administradores.",
   "leaveSpaceDescription": "Todos los chats dentro de este espacio se moverán al archivo. Los demás usuarios podrán ver que has abandonado el espacio.",

lib/pangea/choreographer/controllers/choreographer.dart

@@ -8,6 +8,7 @@ import 'package:fluffychat/pangea/choreographer/controllers/message_options.dart
 import 'package:fluffychat/pangea/constants/language_keys.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';
@@ -570,13 +571,3 @@ class Choreographer {
     return AssistanceState.complete;
   }
 }
-
-// assistance state is, user has not typed a message, user has typed a message and IGC has not run,
-// IGC is running, IGC has run and there are remaining steps (either IT or IGC), or all steps are done
-enum AssistanceState {
-  noMessage,
-  notFetched,
-  fetching,
-  fetched,
-  complete,
-}

lib/pangea/choreographer/widgets/start_igc_button.dart

@@ -1,10 +1,9 @@
 import 'dart:async';
 import 'dart:math' as math;
 
-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart';
-import 'package:fluffychat/pangea/constants/colors.dart';
 import 'package:fluffychat/pangea/controllers/subscription_controller.dart';
+import 'package:fluffychat/pangea/enum/assistance_state_enum.dart';
 import 'package:fluffychat/pangea/widgets/user_settings/p_language_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
@@ -54,15 +53,15 @@ class StartIGCButtonState extends State<StartIGCButton>
     setState(() => prevState = assistanceState);
   }
 
+  bool get itEnabled => widget.controller.choreographer.itEnabled;
+  bool get igcEnabled => widget.controller.choreographer.igcEnabled;
+  CanSendStatus get canSendStatus =>
+      widget.controller.pangeaController.subscriptionController.canSendStatus;
+  bool get grammarCorrectionEnabled =>
+      (itEnabled || igcEnabled) && canSendStatus == CanSendStatus.subscribed;
+
   @override
   Widget build(BuildContext context) {
-    final bool itEnabled = widget.controller.choreographer.itEnabled;
-    final bool igcEnabled = widget.controller.choreographer.igcEnabled;
-    final CanSendStatus canSendStatus =
-        widget.controller.pangeaController.subscriptionController.canSendStatus;
-    final bool grammarCorrectionEnabled =
-        (itEnabled || igcEnabled) && canSendStatus == CanSendStatus.subscribed;
-
     if (!grammarCorrectionEnabled ||
         widget.controller.choreographer.isAutoIGCEnabled ||
         widget.controller.choreographer.choreoMode == ChoreoMode.it) {
@@ -89,7 +88,7 @@ class StartIGCButtonState extends State<StartIGCButton>
           disabledElevation: 0,
           shape: const CircleBorder(),
           onPressed: () {
-            if (assistanceState != AssistanceState.complete) {
+            if (assistanceState != AssistanceState.fetching) {
               widget.controller.choreographer
                   .getLanguageHelp(
                 false,
@@ -142,32 +141,3 @@ class StartIGCButtonState extends State<StartIGCButton>
     );
   }
 }
-
-extension AssistanceStateExtension on AssistanceState {
-  Color stateColor(context) {
-    switch (this) {
-      case AssistanceState.noMessage:
-      case AssistanceState.notFetched:
-      case AssistanceState.fetching:
-        return Theme.of(context).colorScheme.primary;
-      case AssistanceState.fetched:
-        return PangeaColors.igcError;
-      case AssistanceState.complete:
-        return AppConfig.success;
-    }
-  }
-
-  String tooltip(L10n l10n) {
-    switch (this) {
-      case AssistanceState.noMessage:
-      case AssistanceState.notFetched:
-        return l10n.runGrammarCorrection;
-      case AssistanceState.fetching:
-        return "";
-      case AssistanceState.fetched:
-        return l10n.grammarCorrectionFailed;
-      case AssistanceState.complete:
-        return l10n.grammarCorrectionComplete;
-    }
-  }
-}

lib/pangea/enum/assistance_state_enum.dart

@@ -0,0 +1,43 @@
+// assistance state is, user has not typed a message, user has typed a message and IGC has not run,
+// IGC is running, IGC has run and there are remaining steps (either IT or IGC), or all steps are done
+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/pangea/constants/colors.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
+enum AssistanceState {
+  noMessage,
+  notFetched,
+  fetching,
+  fetched,
+  complete,
+}
+
+extension AssistanceStateExtension on AssistanceState {
+  Color stateColor(context) {
+    switch (this) {
+      case AssistanceState.noMessage:
+      case AssistanceState.notFetched:
+      case AssistanceState.fetching:
+        return Theme.of(context).colorScheme.primary;
+      case AssistanceState.fetched:
+        return PangeaColors.igcError;
+      case AssistanceState.complete:
+        return AppConfig.success;
+    }
+  }
+
+  String tooltip(L10n l10n) {
+    switch (this) {
+      case AssistanceState.noMessage:
+      case AssistanceState.notFetched:
+        return l10n.runGrammarCorrection;
+      case AssistanceState.fetching:
+        return "";
+      case AssistanceState.fetched:
+        return l10n.grammarCorrectionFailed;
+      case AssistanceState.complete:
+        return l10n.grammarCorrectionComplete;
+    }
+  }
+}