diff --git a/README.md b/README.md index 7c27b6e2e..a1ad9f2b7 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ # Special thanks -* Pangea Chat is a fork of [FluffyChat](https://fluffychat.im), is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of FluffyChat is to create an easy to use instant messenger which is open source and accessible for everyone. You can [support the primary maker of FluffyChat directly here.](https://ko-fi.com/C1C86VN53) +* Pangea Chat is a fork of [FluffyChat](https://fluffychat.im) which is a [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). You can [support the primary maker of FluffyChat directly here.](https://ko-fi.com/C1C86VN53) * Fabiyamada is a graphics designer and has made the fluffychat logo and the banner. Big thanks for her great designs. diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index c66ef7ac6..cb319c9c7 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -410,7 +410,6 @@ "type": "text", "placeholders": {} }, - "classes": "Classes", "chooseAStrongPassword": "Choose a strong password", "@chooseAStrongPassword": { "type": "text", @@ -616,16 +615,11 @@ } }, "createGroup": "Create group", - "createNewSpace": "Create an exchange space", "createNewGroup": "Create a new chat", "@createNewGroup": { "type": "text", "placeholders": {} }, - "@createNewSpace": { - "type": "text", - "placeholders": {} - }, "currentlyActive": "Currently active", "@currentlyActive": { "type": "text", @@ -2401,7 +2395,7 @@ "@noKeyForThisMessage": {}, "newGroup": "New chat", "@newGroup": {}, - "newSpace": "New class", + "newSpace": "New space", "@newSpace": {}, "enterSpace": "Enter space", "@enterSpace": {}, @@ -2540,7 +2534,7 @@ "type": "text", "placeholders": {} }, - "interactiveTranslatorNotAllowedDesc": "Translation assistance is disabled in space group chats for all participants. This restriction does not apply to Class/Exchange Admin or direct chats.", + "interactiveTranslatorNotAllowedDesc": "Translation assistance is disabled in space group chats for all participants. This restriction does not apply to space admins or direct chats.", "@interactiveTranslatorNotAllowedDesc": { "type": "text", "placeholders": {} @@ -2550,7 +2544,7 @@ "type": "text", "placeholders": {} }, - "interactiveTranslatorRequiredDesc": "Students cannot turn off translation assistance. They can choose not to accept the translation suggestions. This restriction does not apply to Class/Exchange or direct chats.", + "interactiveTranslatorRequiredDesc": "Students cannot turn off translation assistance. They can choose not to accept the translation suggestions. This restriction does not apply to spaces or direct chats.", "@interactiveTranslatorRequiredDesc": { "type": "text", "placeholders": {} @@ -2560,12 +2554,7 @@ "type": "text", "placeholders": {} }, - "multiLingualClass": "Multilingual Class", - "classAnalytics": "Class Analytics", - "@classAnalytics": { - "type": "text", - "placeholders": {} - }, + "multiLingualSpace": "Multilingual Space", "allClasses": "All Classes", "@allClasses": { "type": "text", @@ -2601,18 +2590,8 @@ "type": "text", "placeholders": {} }, - "requestAnExchange": "Request an Exchange", - "@requestAnExchange": { - "type": "text", - "placeholders": {} - }, - "findLanguageExchange": "Find a class exchange partner", - "@findLanguageExchange": { - "type": "text", - "placeholders": {} - }, - "classAnalyticsDesc": "Detailed information on student engagement and language use", - "@classAnalyticsDesc": { + "spaceAnalyticsDesc": "Detailed information on student engagement and language use", + "@spaceAnalyticsDesc": { "type": "text", "placeholders": {} }, @@ -2629,28 +2608,28 @@ "type": "text", "placeholders": {} }, - "classSettings": "Class Settings", - "@classSettings": { + "languageSettings": "Language Settings", + "@languageSettings": { "type": "text", "placeholders": {} }, - "classSettingsDesc": "Edit class languages and proficiency level.", - "@classSettingsDesc": { + "languageSettingsDesc": "Edit space languages and proficiency level.", + "@languageSettingsDesc": { "type": "text", "placeholders": {} }, - "selectClassRoomDominantLanguage": "What is the base language of your class?", - "@selectClassRoomDominantLanguage": { + "selectSpaceDominantLanguage": "What's the most common language of space members?", + "@selectSpaceDominantLanguage": { "type": "text", "placeholders": {} }, - "selectTargetLanguage": "What language are you teaching?", - "@selectTargetLanguage": { + "selectSpaceTargetLanguage": "What is the most common target language of the space?", + "@selectSpaceTargetLanguage": { "type": "text", "placeholders": {} }, - "whatIsYourClassLanguageLevel": "What is the average language level of your class?", - "@whatIsYourClassLanguageLevel": { + "whatIsYourSpaceLanguageLevel": "What is the average language level of the space?", + "@whatIsYourSpaceLanguageLevel": { "type": "text", "placeholders": {} }, @@ -2679,7 +2658,7 @@ "type": "text", "placeholders": {} }, - "createGroupChatsDesc": "Toggle this on to allow students to create group chats within the class/exchange space.", + "createGroupChatsDesc": "Toggle this on to allow students to create group chats within the space.", "@createGroupChatsDesc": { "type": "text", "placeholders": {} @@ -2794,12 +2773,12 @@ "type": "text", "placeholders": {} }, - "joinWithClassCode": "Join class or exchange", + "joinWithClassCode": "Join space", "@joinWithClassCode": { "type": "text", "placeholders": {} }, - "joinWithClassCodeDesc": "Connect to a class or exchange space with the 6-digit invite code provided by the space administrator.", + "joinWithClassCodeDesc": "Connect to a space with the 6-digit invite code provided by the space administrator.", "@joinWithClassCodeDesc": { "type": "text", "placeholders": {} @@ -2809,7 +2788,7 @@ "type": "text", "placeholders": {} }, - "unableToFindClass": "We are unable to find the class or exchange. Please double-check the information with the space administrator. If you are still experiencing an issue, please contact support@pangea.chat.", + "unableToFindClass": "We are unable to find the space. Please double-check the information with the space administrator. If you are still experiencing an issue, please contact support@pangea.chat.", "@unableToFindClass": { "type": "text", "placeholders": {} @@ -2869,12 +2848,12 @@ "type": "text", "placeholders": {} }, - "welcomeToPangea18Plus": "Welcome to Pangea Chat! 🙂\nWhat's next?\nCreate or join a class!\nOr search for a conversation partner!", + "welcomeToPangea18Plus": "Welcome to Pangea Chat! 🙂\nWhat's next?\nCreate or join a space!\nOr search for a conversation partner!", "@welcomeToPangea18Plus": { "type": "text", "placeholders": {} }, - "welcomeToPangeaMinor": "Welcome to Pangea Chat! 🙂\nWhat's next?\nJoin a class!\nAsk your teacher for an invite code.", + "welcomeToPangeaMinor": "Welcome to Pangea Chat! 🙂\nWhat's next?\nJoin a space!\nAsk your teacher for an invite code.", "@welcomeToPangeaMinor": { "type": "text", "placeholders": {} @@ -3174,7 +3153,7 @@ "igcToggleDescription": "This language learning tool will identify common spelling, grammar and punctuation errors in your message and suggest corrections. Though rare, the AI can make correction errors.", "sendOnEnterDescription": "Turn this off to be able to add line spaces in messages. When the toggle is off on the browser app, you can press Shift + Enter to start a new line. When the toggle is off on mobile apps, just Enter will start a new line.", "alreadyInClass": "You are already in this space.", - "pleaseLoginFirst": "Please login or sign up first and then you will be added to your class/exchange space.", + "pleaseLoginFirst": "Please login or sign up first and then you will be added to your space.", "originalMessage": "Original Message", "sentMessage": "Sent Message", "useType": "Use Type", @@ -3185,16 +3164,13 @@ "definitionsToolDescription": "When enabled, words underlined in blue can be clicked for definitions. Click messages to access definitions.", "translationsToolDescrption": "When enabled, click a message and the translation icon to see a message in your base language.", "welcomeBack": "Welcome back! If you were part of the 2023-2024 pilot, please contact us for your special pilot subscription. If you are a teacher who has (or whose institution has) purchased licenses for your class, contact us for your teacher subscription.", - "classExchanges": "Exchanges", "createNewClass": "New class space", - "newExchange": "New exchange space", "kickAllStudents": "Kick All Students", "kickAllStudentsConfirmation": "Are you sure you want to kick all students?", "inviteAllStudents": "Invite All Students", "inviteAllStudentsConfirmation": "Are you sure you want to invite all students?", "inviteStudentsFromOtherClasses": "Invite students from other spaces", "inviteUsersFromPangea": "Add teachers", - "allExchanges": "All Exchanges", "redeemPromoCode": "Redeem Promo Code", "enterPromoCode": "Enter Promo Code", "downloadTxtFile": "Download Text File", @@ -3652,22 +3628,24 @@ "pay": "Pay", "allPrivateChats": "Direct chats", "unknownPrivateChat": "Unknown private chat", - "copyClassCodeDesc": "Students who are already in the app can 'Join class or exchange' via the main menu.", - "addToClass": "Add exchange to class", - "addToClassDesc": "Adding an exchange to a class will make the exchange appear within the class for students and give them access to all chats within the exchange.", - "addToClassOrExchange": "Add chat to class or exchange", - "addToClassOrExchangeDesc": "Adding a chat to a class or exchange will make the chat appear within the class or exchange for students and give them access.", - "invitedToClassOrExchange": "{user} has invited you to join a space: {classOrExchange}! Do you wish to accept?", - "@invitedToClassOrExchange": { + "copyClassCodeDesc": "Students who are already in the app can 'Join space' via the main menu.", + "addToSpaceDesc": "Adding a chat to a space will make the chat appear within the space for students and give them access.", + "@addToSpaceDesc": { "placeholders": { - "classOrExchange": {}, + "roomtype": {} + } + }, + "invitedToSpace": "{user} has invited you to join a space: {space}! Do you wish to accept?", + "@invitedToSpace": { + "placeholders": { + "space": {}, "user": {} } }, "declinedInvitation": "Declined invitation", "acceptedInvitation": "Accepted invitation", "youreInvited": "📩 You're invited!", - "studentPermissionsDesc": "Set permissions for this space. They will only apply to the class/exchange space. They will override individual user settings.", + "studentPermissionsDesc": "Set permissions for this space. They will only apply to the space. They will override individual user settings.", "noEligibleSpaces": "There are no eligible spaces to add this to.", "youAddedToSpace": "You added {child} to {space}", "@youAddedToSpace": { @@ -3705,9 +3683,9 @@ }, "emptyChatNameWarning": "Please enter a name for this chat", "emptyClassNameWarning": "Please enter a name for this class", - "emptyExchangeNameWarning": "Please enter a name for this exchange", + "emptySpaceNameWarning": "Please enter a name for this space", "blurMeansTranslateTitle": "Why is the message blurred?", - "blurMeansTranslateBody": "While Immersion Mode is on, messages that are sent in your base language will be blurred while Pangea Bot translates them to your target language. Immersion Mode can be toggled in individual and class settings.", + "blurMeansTranslateBody": "While Immersion Mode is on, messages that are sent in your base language will be blurred while Pangea Bot translates them to your target language. Immersion Mode can be toggled in individual and space settings.", "someErrorTitle": "Hm, something's not right", "someErrorBody": "It could be an error or something in your base language.", "bestCorrectionFeedback": "That's correct!", @@ -3717,7 +3695,7 @@ "practiceDefaultPrompt": "What is the best answer?", "correctionDefaultPrompt": "What is the best replacement?", "itStartDefaultPrompt": "Do you want help translating?", - "languageLevelWarning": "Please select a class language level", + "languageLevelWarning": "Please select a space language level", "lockedChatWarning": "🔒 This chat has been locked", "lockSpace": "Lock Space", "lockChat": "Lock Chat", @@ -3730,7 +3708,6 @@ "why": "Why?", "definition": "Definition", "exampleSentence": "Example Sentence", - "addToClassTitle": "Add Exchange to Class", "reportToTeacher": "Who do you want to report this message to?", "reportMessageTitle": "{reportingUserId} has reported a message from {reportedUserId} in the chat {roomName}", "@reportMessageTitle": { @@ -3777,7 +3754,6 @@ }, "searchChatsRooms": "Search for #chats, @users...", "createClass": "Create class", - "createExchange": "Create exchange", "viewArchive": "View Archive", "trialExpiration": "Your free trial expires on {expiration}", "@trialExpiration": { @@ -3787,10 +3763,10 @@ }, "freeTrialDesc": "New users recieve a one week free trial of Pangea Chat", "activateTrial": "Activate Free Trial", - "inNoSpaces": "You are not a member of any classes or exchanges", + "inNoSpaces": "You are not a member of any spaces", "successfullySubscribed": "You have successfully subscribed!", "clickToManageSubscription": "Click here to manage your subscription.", - "emptyInviteWarning": "Add this chat to a class or exchange to invite other users.", + "emptyInviteWarning": "Add this chat to a space to invite other users.", "errorGettingAudio": "Error getting audio. Please refresh and try again.", "nothingFound": "Nothing found...", "groupName": "Group name", @@ -4034,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.", @@ -4068,5 +4044,19 @@ "@knockRestricted": {}, "nonexistentSelection": "Selection no longer exists.", "cantAddSpaceChild": "You do not have permission to add a child to this space.", - "roomAddedToSpace": "Room(s) have been added to the selected space." + "roomAddedToSpace": "Room(s) have been added to the selected space.", + "createNewSpace": "New space", + "@createNewSpace": { + "type": "text", + "placeholders": {} + }, + "addChatToSpaceDesc": "Adding a chat to a space will make the chat appear within the space for students and give them access.", + "addSpaceToSpaceDesc": "Adding a space to another space will make the child space appear within the parent space for students and give them access.", + "spaceAnalytics": "Space Analytics", + "changeAnalyticsLanguage": "Change Analytics Language", + "suggestToSpace": "Suggest this space", + "suggestToSpaceDesc": "Suggested spaces will appear in the chat lists for their parent spaces", + "practice": "Practice", + "noLanguagesSet": "No languages set", + "noActivitiesFound": "No practice activities found for this message" } \ No newline at end of file diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb index 44a03f0e1..dc328294a 100644 --- a/assets/l10n/intl_es.arb +++ b/assets/l10n/intl_es.arb @@ -2752,31 +2752,11 @@ "type": "text", "placeholders": {} }, - "openToExchanges": "¿Abierto a intercambios?", - "@openToExchanges": { - "type": "text", - "placeholders": {} - }, - "oneToOneChatsWithinExchanges": "Chats Privados dentro de Intercambios", - "@oneToOneChatsWithinExchanges": { - "type": "text", - "placeholders": {} - }, "createGroupChats": "Crear Chats Grupales", "@createGroupChats": { "type": "text", "placeholders": {} }, - "createGroupChatsInExchanges": "Crear Chats Grupales en Intercambios", - "@createGroupChatsInExchanges": { - "type": "text", - "placeholders": {} - }, - "createGroupChatsInExchangesDesc": "Active esta opción para permitir que los estudiantes creen chats grupales dentro de los intercambios.", - "@createGroupChatsInExchangesDesc": { - "type": "text", - "placeholders": {} - }, "shareStories": "Subir historias", "@shareStories": { "type": "text", @@ -2917,21 +2897,11 @@ "type": "text", "placeholders": {} }, - "findLanguageExchange": "Encuentre una clase de intercambio", - "@findLanguageExchange": { - "type": "text", - "placeholders": {} - }, "requestToEnroll": "Solicitar inscripción", "@requestToEnroll": { "type": "text", "placeholders": {} }, - "requestAnExchange": "Solicitar un intercambio", - "@requestAnExchange": { - "type": "text", - "placeholders": {} - }, "targetLanguage": "Idioma a aprender", "@targetLanguage": { "type": "text", @@ -2982,11 +2952,6 @@ "type": "text", "placeholders": {} }, - "classSettings": "Ajustes de clase", - "@classSettings": { - "type": "text", - "placeholders": {} - }, "suggestToClass": "Sugiera el chat a", "@suggestToClass": { "type": "text", @@ -3032,8 +2997,8 @@ "type": "text", "placeholders": {} }, - "classAnalyticsDesc": "Información detallada sobre la participación de los estudiantes y el uso del idioma", - "@classAnalyticsDesc": { + "spaceAnalyticsDesc": "Información detallada sobre la participación de los estudiantes y el uso del idioma", + "@spaceAnalyticsDesc": { "type": "text", "placeholders": {} }, @@ -3815,7 +3780,6 @@ "sentMessage": "Mensaje enviado", "useType": "Tipo de Uso", "notAvailable": "No disponible", - "classExchanges": "Intercambios", "kickAllStudents": "Patear a todos los estudiantes", "kickAllStudentsConfirmation": "¿Estás seguro de que quieres echar a todos los estudiantes?", "inviteAllStudents": "Invitar a todos los estudiantes", @@ -4296,7 +4260,6 @@ "copyClassLink": "Copiar enlace de invitación", "copyClassLinkDesc": "Al hacer clic en este enlace, los usuarios accederán a la aplicación, se abrirán una cuenta y se unirán automáticamente a este espacio.", "copyClassCode": "Copiar código de invitación", - "classSettingsDesc": "Editar idiomas de clase y nivel", "createGroupChatsDesc": "Active esta opción para permitir a los estudiantes crear chats de grupo dentro del espacio de clase/intercambio.", "joinWithClassCode": "Únete a una clase o a un intercambio", "joinWithClassCodeDesc": "Conéctese a una clase o espacio de intercambio con el código de invitación de 6 dígitos proporcionado por el administrador del espacio.", @@ -4304,8 +4267,6 @@ "unableToFindClass": "No podemos encontrar la clase o el intercambio. Por favor, vuelva a comprobar la información con el administrador del espacio. Si sigue teniendo problemas, póngase en contacto con support@pangea.chat.", "welcomeToYourNewClass": "Bienvenido 🙂", "welcomeToClass": "Bienvenido! 🙂\n- ¡Prueba a unirte a un chat!\n- ¡Diviértete chateando!", - "welcomeToPangea18Plus": "Bienvenido al chat de Pangea 🙂 .\n¿Qué es lo siguiente?\n¡Crea una clase o únete a ella!\n¡O busca un compañero de conversación!", - "welcomeToPangeaMinor": "Bienvenido al chat de Pangea 🙂 .\n¿Qué es lo siguiente?\n¡Únete a una clase!\nPide a tu profesor un código de invitación.", "unableToFindClassCode": "No se puede encontrar el código.", "errorDisableITClassDesc": "La ayuda a la traducción está desactivada para el espacio en el que se encuentra este chat.", "errorDisableIGCClassDesc": "La asistencia gramatical está desactivada para el espacio en el que se encuentra este chat.", @@ -4317,26 +4278,14 @@ "pleaseLoginFirst": "Inicie sesión o regístrese primero y, a continuación, se le añadirá a su clase/espacio de intercambio.", "welcomeBack": "¡Bienvenido de nuevo! Si formó parte del piloto 2023-2024, póngase en contacto con nosotros para obtener su suscripción especial de piloto. Si es usted un profesor que ha adquirido (o cuya institución ha adquirido) licencias para su clase, póngase en contacto con nosotros para obtener su suscripción de profesor.", "createNewClass": "Nuevo espacio para clases", - "newExchange": "Nuevo espacio de intercambio", "inviteStudentsFromOtherClasses": "Invitar a estudiantes de otros espacios", - "allExchanges": "Todos los intercambios", "creatingSpacePleaseWait": "Creando espacio. Por favor, espere...", "pay": "Pagar", "copyClassCodeDesc": "Los estudiantes que ya están en la aplicación pueden 'Unirse a una clase o a un intercambio' a través del menú principal.", "inviteUsersFromPangea": "Añadir profesores", "addToClass": "Añadir intercambio a la clase", - "addToClassOrExchange": "Añadir chat a la clase o al intercambio", - "classAnalytics": "Análisis de clase", "myLearning": "Mis análisis", "addToClassDesc": "Añadir un intercambio a una clase hará que el intercambio aparezca dentro de la clase para los estudiantes y les dará acceso a todos los chats dentro del intercambio.", - "addToClassOrExchangeDesc": "Añadir un chat a una clase o intercambio hará que el chat aparezca dentro de la clase o intercambio para los estudiantes y les dará acceso.", - "invitedToClassOrExchange": "{user} te ha invitado a unirte a ¡{classOrExchange}! ¿Deseas aceptar?", - "@invitedToClassOrExchange": { - "placeholders": { - "classOrExchange": {}, - "user": {} - } - }, "decline": "Disminución", "declinedInvitation": "Invitación rechazada", "acceptedInvitation": "Invitación aceptada", @@ -4369,14 +4318,11 @@ }, "emptyChatNameWarning": "Introduzca un nombre para este chat", "emptyClassNameWarning": "Introduzca un nombre para esta clase", - "emptyExchangeNameWarning": "Introduzca un nombre para este intercambio", "blurMeansTranslateTitle": "¿Por qué está borroso el mensaje?", - "blurMeansTranslateBody": "Mientras el Modo Inmersión esté activado, los mensajes que se envíen en su idioma base aparecerán borrosos mientras Pangea Bot los traduce a su idioma de destino. El modo inmersión puede activarse en los ajustes individuales y de clase.", "monthlySubscription": "Mensualmente", "yearlySubscription": "Anualmente", "defaultSubscription": "Suscripción al chat de Pangea", "freeTrial": "Prueba gratuita", - "languageLevelWarning": "Seleccione un nivel de idioma de clase", "lockedChatWarning": "🔒 Este chat ha sido bloqueado", "lockSpace": "Espacio de bloqueo", "lockChat": "Chat de bloqueo", @@ -4393,7 +4339,6 @@ "itStartDefaultPrompt": "¿Quiere ayuda para traducir?", "suggestTo": "Sugerir a {spaceName}", "suggestChatDesc": "Los chats sugeridos aparecerán en la lista de chats de {spaceName}.", - "suggestExchangeDesc": "Los intercambios sugeridos aparecerán en la lista de chat de {spaceName}.", "acceptSelection": "Aceptar corrección", "acceptSelectionAnyway": "Use esto de todos modos", "makingActivity": "Actividad de fabricación", @@ -4460,7 +4405,6 @@ "groupCanBeFoundViaSearch": "El grupo se puede encontrar a través de la búsqueda", "inNoSpaces": "No es miembro de ninguna clase o bolsa", "createClass": "Crear clase", - "createExchange": "Crear intercambio", "viewArchive": "Ver archivo", "trialExpiration": "Su prueba gratuita caduca el {expiration}.", "@trialExpiration": { @@ -4665,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.", @@ -4675,5 +4619,86 @@ "tooltipInstructionsTitle": "¿No sabes para qué sirve?", "tooltipInstructionsMobileBody": "Mantenga pulsados los elementos para ver la información sobre herramientas.", "tooltipInstructionsBrowserBody": "Pase el ratón sobre los elementos para ver información sobre herramientas.", - "buildTranslation": "Construye tu traducción a partir de las opciones anteriores" + "buildTranslation": "Construye tu traducción a partir de las opciones anteriores", + "appLockDescription": "Bloquea la aplicación cuando no la uses con un código pin", + "swipeRightToLeftToReply": "Desliza el dedo de derecha a izquierda para responder", + "globalChatId": "ID global del chat", + "accessAndVisibility": "Acceso y visibilidad", + "accessAndVisibilityDescription": "Quién puede participar en este chat y cómo se puede descubrir el chat.", + "calls": "Llamadas", + "customEmojisAndStickers": "Emojis y pegatinas personalizados", + "customEmojisAndStickersBody": "Añade o comparte emojis o stickers personalizados que podrás utilizar en cualquier chat.", + "hideRedactedMessages": "Ocultar mensajes redactados", + "hideRedactedMessagesBody": "Si alguien borra un mensaje, éste ya no será visible en el chat.", + "hideInvalidOrUnknownMessageFormats": "Ocultar formatos de mensaje no válidos o desconocidos", + "hideMemberChangesInPublicChats": "Ocultar los cambios de los miembros en los chats públicos", + "hideMemberChangesInPublicChatsBody": "No mostrar en la línea de tiempo del chat si alguien se une o abandona un chat público para mejorar la legibilidad.", + "overview": "Visión general", + "notifyMeFor": "Notificarme para", + "passwordRecoverySettings": "Configuración de recuperación de contraseña", + "usersMustKnock": "Los usuarios deben golpear", + "userWouldLikeToChangeTheChat": "{user} desea unirse al chat.", + "@userWouldLikeToChangeTheChat": { + "placeholders": { + "user": {} + } + }, + "noPublicLinkHasBeenCreatedYet": "Aún no se ha creado ningún enlace público", + "knock": "Knock", + "multiLingualSpace": "Espacio multilingüe", + "languageSettings": "Ajustes de idioma", + "languageSettingsDesc": "Editar idiomas espaciales y nivel de competencia.", + "selectSpaceDominantLanguage": "¿Cuál es la lengua más común de los miembros del espacio?", + "selectSpaceTargetLanguage": "¿Cuál es la lengua de destino más común del espacio?", + "whatIsYourSpaceLanguageLevel": "¿Cuál es el nivel lingüístico medio del espacio?", + "welcomeToPangea18Plus": "Bienvenido al chat de Pangea 🙂 .\n¿Qué es lo siguiente?\n¡Crea o únete a un espacio!\n¡O busca un compañero de conversación!", + "welcomeToPangeaMinor": "Bienvenido al chat de Pangea 🙂 .\n¿Qué es lo siguiente?\n¡Únete a un espacio!\nPide a tu profesor un código de invitación.", + "addToSpaceDesc": "Añadir un chat a un espacio hará que el chat aparezca dentro del espacio para los estudiantes y les dará acceso.", + "invitedToSpace": "{user} te ha invitado a unirte a un espacio: ¡{space}! ¿Deseas aceptar?", + "@invitedToSpace": { + "placeholders": { + "space": {}, + "user": {} + } + }, + "emptySpaceNameWarning": "Introduzca un nombre para este espacio", + "blurMeansTranslateBody": "Mientras el Modo Inmersión esté activado, los mensajes que se envíen en tu idioma base aparecerán borrosos mientras Pangea Bot los traduce a tu idioma de destino. El Modo Inmersión puede activarse en los ajustes individuales y espaciales.", + "languageLevelWarning": "Seleccione un nivel de lengua espacial", + "knocking": "Golpeando", + "chatCanBeDiscoveredViaSearchOnServer": "El chat puede descubrirse mediante la búsqueda en {server}.", + "@chatCanBeDiscoveredViaSearchOnServer": { + "type": "text", + "placeholders": { + "server": {} + } + }, + "publicChatAddresses": "Direcciones de chat públicas", + "createNewAddress": "Crear una nueva dirección", + "userRole": "Función del usuario", + "minimumPowerLevel": "{level} es el nivel mínimo de potencia.", + "@minimumPowerLevel": { + "type": "text", + "placeholders": { + "level": {} + } + }, + "searchMore": "Buscar más...", + "gallery": "Galería", + "files": "Archivos", + "addSpaceToSpaceDescription": "Seleccione un espacio para añadir como padre", + "noDatabaseEncryption": "La encriptación de la base de datos no es compatible con esta plataforma", + "thereAreCountUsersBlocked": "Ahora mismo hay {count} usuarios bloqueados.", + "@thereAreCountUsersBlocked": { + "type": "text", + "count": {} + }, + "restricted": "Restringido", + "knockRestricted": "Golpe restringido", + "nonexistentSelection": "La selección ya no existe.", + "cantAddSpaceChild": "No tiene permiso para añadir un niño a este espacio.", + "roomAddedToSpace": "Se han añadido habitaciones al espacio seleccionado.", + "addChatToSpaceDesc": "Añadir un chat a un espacio hará que el chat aparezca dentro del espacio para los estudiantes y les dará acceso.", + "addSpaceToSpaceDesc": "Añadir un espacio a otro espacio hará que el espacio hijo aparezca dentro del espacio padre para los estudiantes y les dará acceso.", + "spaceAnalytics": "Analítica espacial", + "changeAnalyticsLanguage": "Cambiar el lenguaje analítico" } \ No newline at end of file diff --git a/lib/config/routes.dart b/lib/config/routes.dart index debc48968..eba1ae511 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -29,7 +29,6 @@ import 'package:fluffychat/pages/settings_style/settings_style.dart'; import 'package:fluffychat/pangea/enum/bar_chart_view_enum.dart'; import 'package:fluffychat/pangea/guard/p_vguard.dart'; import 'package:fluffychat/pangea/pages/analytics/student_analytics/student_analytics.dart'; -import 'package:fluffychat/pangea/pages/exchange/add_exchange_to_class.dart'; import 'package:fluffychat/pangea/pages/find_partner/find_partner.dart'; import 'package:fluffychat/pangea/pages/p_user_age/p_user_age.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning.dart'; @@ -43,8 +42,8 @@ import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import '../pangea/pages/analytics/class_analytics/class_analytics.dart'; -import '../pangea/pages/analytics/class_list/class_list.dart'; +import '../pangea/pages/analytics/space_analytics/space_analytics.dart'; +import '../pangea/pages/analytics/space_list/space_list.dart'; abstract class AppRoutes { static FutureOr loggedInRedirect( @@ -202,17 +201,17 @@ abstract class AppRoutes { pageBuilder: (context, state) => defaultPageBuilder( context, state, - const AnalyticsClassList(), + const AnalyticsSpaceList(), ), redirect: loggedOutRedirect, routes: [ GoRoute( - path: ':classid', + path: ':spaceid', redirect: loggedOutRedirect, pageBuilder: (context, state) => defaultPageBuilder( context, state, - const ClassAnalyticsPage(), + const SpaceAnalyticsPage(), ), routes: [ GoRoute( @@ -220,7 +219,7 @@ abstract class AppRoutes { pageBuilder: (context, state) => defaultPageBuilder( context, state, - const ClassAnalyticsPage( + const SpaceAnalyticsPage( selectedView: BarChartViewSelection.messages, ), ), @@ -230,7 +229,7 @@ abstract class AppRoutes { pageBuilder: (context, state) => defaultPageBuilder( context, state, - const ClassAnalyticsPage( + const SpaceAnalyticsPage( selectedView: BarChartViewSelection.grammar, ), ), @@ -311,24 +310,6 @@ abstract class AppRoutes { redirect: loggedOutRedirect, ), // #Pangea - GoRoute( - path: 'newspace/:newexchange', - pageBuilder: (context, state) => defaultPageBuilder( - context, - state, - const NewSpace(), - ), - redirect: loggedOutRedirect, - ), - GoRoute( - path: 'join_exchange/:exchangeid', - pageBuilder: (context, state) => defaultPageBuilder( - context, - state, - const AddExchangeToClass(), - ), - redirect: loggedOutRedirect, - ), GoRoute( path: 'partner', pageBuilder: (context, state) => defaultPageBuilder( diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index b199a1b67..13f09ffb6 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -20,8 +20,8 @@ import 'package:fluffychat/pangea/enum/use_type.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/models/choreo_record.dart'; -import 'package:fluffychat/pangea/models/class_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'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; @@ -317,10 +317,10 @@ class ChatController extends State Future.delayed(const Duration(seconds: 1), () async { if (!mounted) return; debugPrint( - "chat.dart l1 ${pangeaController.languageController.activeL1Code(roomID: roomId)}", + "chat.dart l1 ${pangeaController.languageController.userL1?.langCode}", ); debugPrint( - "chat.dart l2 ${pangeaController.languageController.activeL2Code(roomID: roomId)}", + "chat.dart l2 ${pangeaController.languageController.userL2?.langCode}", ); if (mounted) { pangeaController.languageController.showDialogOnEmptyLanguage( @@ -654,8 +654,6 @@ class ChatController extends State ); return; } - // ensure that analytics room exists / is created for the active langCode - await room.ensureAnalyticsRoomExists(); }, onError: (err, stack) => ErrorHandler.logError(e: err, s: stack), ); diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index dc129a192..c5756438c 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -3,6 +3,7 @@ import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/enum/use_type.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; +import 'package:fluffychat/pangea/widgets/chat/message_buttons.dart'; import 'package:fluffychat/pangea/widgets/chat/message_toolbar.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/string_color.dart'; @@ -524,7 +525,14 @@ class Message extends StatelessWidget { Widget container; final showReceiptsRow = event.hasAggregatedEvents(timeline, RelationshipTypes.reaction); - if (showReceiptsRow || displayTime || selected || displayReadMarker) { + // #Pangea + // if (showReceiptsRow || displayTime || selected || displayReadMarker) { + if (showReceiptsRow || + displayTime || + selected || + displayReadMarker || + (pangeaMessageEvent?.showMessageButtons ?? false)) { + // Pangea# container = Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: @@ -561,7 +569,11 @@ class Message extends StatelessWidget { AnimatedSize( duration: FluffyThemes.animationDuration, curve: FluffyThemes.animationCurve, - child: !showReceiptsRow + // #Pangea + child: !showReceiptsRow && + !(pangeaMessageEvent?.showMessageButtons ?? false) + // child: !showReceiptsRow + // Pangea# ? const SizedBox.shrink() : Padding( padding: EdgeInsets.only( @@ -569,7 +581,19 @@ class Message extends StatelessWidget { left: (ownMessage ? 0 : Avatar.defaultSize) + 12.0, right: ownMessage ? 0 : 12.0, ), - child: MessageReactions(event, timeline), + // #Pangea + child: Row( + mainAxisAlignment: ownMessage + ? MainAxisAlignment.end + : MainAxisAlignment.start, + children: [ + if (pangeaMessageEvent?.showMessageButtons ?? false) + MessageButtons(toolbarController: toolbarController), + MessageReactions(event, timeline), + ], + ), + // child: MessageReactions(event, timeline), + // Pangea# ), ), if (displayReadMarker) diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 93496beee..4f4e091d0 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -11,10 +11,8 @@ import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/class_nam import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_capacity_button.dart'; import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart'; import 'package:fluffychat/pangea/utils/lock_room.dart'; -import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_settings.dart'; -import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; @@ -105,7 +103,7 @@ class ChatDetailsView extends StatelessWidget { ), body: MaxWidthBody( // #Pangea - // chat description title has its own scrollbar so we disable the parent one + // Chat description title has its own scrollbar so we disable the parent one // otherwise they scroll with each other child: ScrollConfiguration( behavior: @@ -265,11 +263,10 @@ class ChatDetailsView extends StatelessWidget { controller: controller, ), // Pangea# - if ((room.isPangeaClass || room.isExchange) && - room.isRoomAdmin) + if (room.isSpace && room.isRoomAdmin) ListTile( title: Text( - L10n.of(context)!.classAnalytics, + L10n.of(context)!.spaceAnalytics, style: TextStyle( color: Theme.of(context).colorScheme.secondary, @@ -288,11 +285,12 @@ class ChatDetailsView extends StatelessWidget { '/rooms/analytics/${room.id}', ), ), - if (room.classSettings != null && room.isRoomAdmin) - ClassSettings( - roomId: controller.roomId, - startOpen: false, - ), + // commenting out language settings in spaces for now + // if (room.languageSettings != null && room.isRoomAdmin) + // LanguageSettings( + // roomId: controller.roomId, + // startOpen: false, + // ), if (room.pangeaRoomRules != null) RoomRulesEditor( roomId: controller.roomId, @@ -474,16 +472,11 @@ class ChatDetailsView extends StatelessWidget { room: room, ), const Divider(height: 1), - if (!room.isPangeaClass && - !room.isDirectChat && - room.isRoomAdmin) + if (!room.isDirectChat && room.isRoomAdmin) AddToSpaceToggles( roomId: room.id, key: controller.addToSpaceKey, startOpen: false, - mode: room.isExchange - ? AddToClassMode.exchange - : AddToClassMode.chat, ), const Divider(height: 1), if (!room.isDirectChat) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 9d7ff2440..569eba880 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:io'; import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:collection/collection.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; @@ -213,32 +212,12 @@ class ChatListController extends State } List get filteredRooms => Matrix.of(context) - .client - .rooms - .where( - getRoomFilterByActiveFilter(activeFilter), - ) - // #Pangea - .sorted((roomA, roomB) { - // put rooms with unread messages at the top of the list - if (roomA.membership == Membership.invite && - roomB.membership != Membership.invite) { - return -1; - } - if (roomA.membership != Membership.invite && - roomB.membership == Membership.invite) { - return 1; - } - - final bool aUnread = roomA.notificationCount > 0 || roomA.markedUnread; - final bool bUnread = roomB.notificationCount > 0 || roomB.markedUnread; - if (aUnread && !bUnread) return -1; - if (!aUnread && bUnread) return 1; - - return 0; - }) - // Pangea# - .toList(); + .client + .rooms + .where( + getRoomFilterByActiveFilter(activeFilter), + ) + .toList(); bool isSearchMode = false; Future? publicRoomsResponse; diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index 56aa568c0..4ad107f6b 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -1,8 +1,9 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:fluffychat/pangea/constants/class_default_values.dart'; -import 'package:fluffychat/pangea/utils/class_code.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/find_conversation_partner_dialog.dart'; import 'package:fluffychat/pangea/utils/logout.dart'; +import 'package:fluffychat/pangea/utils/space_code.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -58,17 +59,19 @@ class ClientChooserButton extends StatelessWidget { room.isSpace && room.ownPowerLevel >= ClassDefaultValues.powerLevelOfAdmin, ), - value: SettingsAction.classAnalytics, + value: SettingsAction.spaceAnalytics, child: Row( children: [ const Icon(Icons.analytics_outlined), const SizedBox(width: 18), - Expanded(child: Text(L10n.of(context)!.classAnalytics)), + Expanded(child: Text(L10n.of(context)!.spaceAnalytics)), ], ), ), PopupMenuItem( - enabled: matrix.client.rooms.isNotEmpty, + enabled: matrix.client.rooms.any( + (room) => !room.isSpace && !room.isArchived && !room.isAnalyticsRoom, + ), value: SettingsAction.myAnalytics, child: Row( children: [ @@ -84,7 +87,7 @@ class ClientChooserButton extends StatelessWidget { children: [ const Icon(Icons.school), const SizedBox(width: 18), - Expanded(child: Text(L10n.of(context)!.createNewClass)), + Expanded(child: Text(L10n.of(context)!.createNewSpace)), ], ), ), @@ -98,16 +101,6 @@ class ClientChooserButton extends StatelessWidget { // ], // ), // ), - PopupMenuItem( - value: SettingsAction.newExchange, - child: Row( - children: [ - const Icon(Icons.connecting_airports), - const SizedBox(width: 18), - Expanded(child: Text(L10n.of(context)!.newExchange)), - ], - ), - ), if (controller.pangeaController.permissionsController.isUser18()) PopupMenuItem( value: SettingsAction.findAConversationPartner, @@ -397,11 +390,8 @@ class ClientChooserButton extends StatelessWidget { case SettingsAction.newClass: context.go('/rooms/newspace'); break; - case SettingsAction.newExchange: - context.go('/rooms/newspace/exchange'); - break; case SettingsAction.joinWithClassCode: - ClassCodeUtil.joinWithClassCodeDialog( + SpaceCodeUtil.joinWithSpaceCodeDialog( context, controller.pangeaController, ); @@ -412,7 +402,7 @@ class ClientChooserButton extends StatelessWidget { controller.pangeaController, ); break; - case SettingsAction.classAnalytics: + case SettingsAction.spaceAnalytics: context.go('/rooms/analytics'); break; case SettingsAction.myAnalytics: @@ -507,11 +497,10 @@ enum SettingsAction { // #Pangea learning, joinWithClassCode, - classAnalytics, + spaceAnalytics, myAnalytics, findAConversationPartner, logout, newClass, - newExchange // Pangea# } diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart index ea81c842c..2b1dff187 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -35,11 +35,26 @@ class ChatPermissionsSettingsView extends StatelessWidget { final powerLevels = Map.from(powerLevelsContent) // #Pangea // ..removeWhere((k, v) => v is! int); - ..removeWhere((k, v) => v is! int || k.equals("m.call.invite")); + ..removeWhere( + (k, v) => + v is! int || + k.equals("m.call.invite") || + k.equals("historical") || + k.equals("state_default"), + ); // Pangea# final eventsPowerLevels = Map.from( powerLevelsContent.tryGetMap('events') ?? {}, - )..removeWhere((k, v) => v is! int); + // #Pangea + )..removeWhere( + (k, v) => + v is! int || + k.equals("m.space.child") || + k.equals("pangea.usranalytics") || + k.equals(EventTypes.RoomPowerLevels), + ); + // )..removeWhere((k, v) => v is! int); + // Pangea# return Column( children: [ Column( @@ -57,51 +72,59 @@ class ChatPermissionsSettingsView extends StatelessWidget { ), canEdit: room.canChangePowerLevel, ), - Divider(color: Theme.of(context).dividerColor), - ListTile( - title: Text( - L10n.of(context)!.notifications, - style: TextStyle( - color: Theme.of(context).colorScheme.primary, - fontWeight: FontWeight.bold, - ), - ), - ), - Builder( - builder: (context) { - const key = 'rooms'; - final value = powerLevelsContent - .containsKey('notifications') - ? powerLevelsContent - .tryGetMap('notifications') - ?.tryGet('rooms') ?? - 0 - : 0; - return PermissionsListTile( - permissionKey: key, - permission: value, - category: 'notifications', - canEdit: room.canChangePowerLevel, - onChanged: (level) => controller.editPowerLevel( - context, - key, - value, - newLevel: level, - category: 'notifications', + // #Pangea + // Why would teacher need to stop students from seeing notifications? + // Divider(color: Theme.of(context).dividerColor), + // ListTile( + // title: Text( + // L10n.of(context)!.notifications, + // style: TextStyle( + // color: Theme.of(context).colorScheme.primary, + // fontWeight: FontWeight.bold, + // ), + // ), + // ), + // Builder( + // builder: (context) { + // const key = 'rooms'; + // final value = powerLevelsContent + // .containsKey('notifications') + // ? powerLevelsContent + // .tryGetMap('notifications') + // ?.tryGet('rooms') ?? + // 0 + // : 0; + // return PermissionsListTile( + // permissionKey: key, + // permission: value, + // category: 'notifications', + // canEdit: room.canChangePowerLevel, + // onChanged: (level) => controller.editPowerLevel( + // context, + // key, + // value, + // newLevel: level, + // category: 'notifications', + // ), + // ); + // }, + // ), + // Only show if there are actually items in this category + if (eventsPowerLevels.isNotEmpty) + // Pangea# + Divider(color: Theme.of(context).dividerColor), + // #Pangea + if (eventsPowerLevels.isNotEmpty) + // Pangea# + ListTile( + title: Text( + L10n.of(context)!.configureChat, + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + fontWeight: FontWeight.bold, ), - ); - }, - ), - Divider(color: Theme.of(context).dividerColor), - ListTile( - title: Text( - L10n.of(context)!.configureChat, - style: TextStyle( - color: Theme.of(context).colorScheme.primary, - fontWeight: FontWeight.bold, ), ), - ), for (final entry in eventsPowerLevels.entries) PermissionsListTile( permissionKey: entry.key, diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index b3a1703af..7e77efe56 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -174,7 +174,7 @@ class NewGroupController extends State { void initState() { Future.delayed(Duration.zero, () { chatTopic.langCode = - pangeaController.languageController.activeL2Code(roomID: null) ?? + pangeaController.languageController.userL2?.langCode ?? pangeaController.pLanguageStore.targetOptions.first.langCode; setState(() {}); }); diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index 277a7402f..b8b43c3f1 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -1,7 +1,6 @@ import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/new_group/new_group.dart'; import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_capacity_button.dart'; -import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_settings.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; @@ -100,7 +99,6 @@ class NewGroupView extends StatelessWidget { key: controller.addToSpaceKey, startOpen: true, activeSpaceId: controller.activeSpaceId, - mode: AddToClassMode.chat, ), // const SizedBox(height: 16), // SwitchListTile.adaptive( diff --git a/lib/pages/new_space/new_space.dart b/lib/pages/new_space/new_space.dart index 59818d3b2..7a7759349 100644 --- a/lib/pages/new_space/new_space.dart +++ b/lib/pages/new_space/new_space.dart @@ -8,16 +8,14 @@ import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_capa import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/class_chat_power_levels.dart'; -import 'package:fluffychat/pangea/utils/class_code.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; +import 'package:fluffychat/pangea/utils/space_code.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; -import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart' as sdk; import 'package:matrix/matrix.dart'; @@ -36,8 +34,9 @@ class NewSpaceController extends State { bool publicGroup = true; final GlobalKey rulesEditorKey = GlobalKey(); final GlobalKey addToSpaceKey = GlobalKey(); - final GlobalKey classSettingsKey = - GlobalKey(); + // commenting out language settings in spaces for now + // final GlobalKey languageSettingsKey = + // GlobalKey(); final GlobalKey addCapacityKey = GlobalKey(); @@ -68,8 +67,6 @@ class NewSpaceController extends State { void setPublicGroup(bool b) => setState(() => publicGroup = b); // #Pangea - bool newClassMode = true; - List get initialState { final events = []; @@ -95,11 +92,11 @@ class NewSpaceController extends State { } else { debugger(when: kDebugMode); } - if (classSettingsKey.currentState != null) { - events.add(classSettingsKey.currentState!.classSettings.toStateEvent); - } else { - debugger(when: kDebugMode && newClassMode); - } + // commenting out language settings in spaces for now + // if (languageSettingsKey.currentState != null) { + // events + // .add(languageSettingsKey.currentState!.languageSettings.toStateEvent); + // } return events; } @@ -117,33 +114,30 @@ class NewSpaceController extends State { debugger(when: kDebugMode); return; } - if (classSettingsKey.currentState != null && - classSettingsKey.currentState!.sameLanguages) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(L10n.of(context)!.noIdenticalLanguages), - ), - ); - return; - } - if (newClassMode) { - final int? languageLevel = - classSettingsKey.currentState!.classSettings.languageLevel; - if (languageLevel == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text(L10n.of(context)!.languageLevelWarning)), - ); - return; - } - } + // commenting out language settings in spaces for now + // if (languageSettingsKey.currentState != null && + // languageSettingsKey.currentState!.sameLanguages) { + // ScaffoldMessenger.of(context).showSnackBar( + // SnackBar( + // content: Text(L10n.of(context)!.noIdenticalLanguages), + // ), + // ); + // return; + // } + // final int? languageLevel = + // languageSettingsKey.currentState!.languageSettings.languageLevel; + // if (languageLevel == null) { + // ScaffoldMessenger.of(context).showSnackBar( + // SnackBar(content: Text(L10n.of(context)!.languageLevelWarning)), + // ); + // return; + // } // Pangea# if (nameController.text.isEmpty) { setState(() { // #Pangea // nameError = L10n.of(context)!.pleaseChoose; - final String warning = newClassMode - ? L10n.of(context)!.emptyClassNameWarning - : L10n.of(context)!.emptyExchangeNameWarning; + final String warning = L10n.of(context)!.emptySpaceNameWarning; ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text(warning)), ); @@ -168,7 +162,7 @@ class NewSpaceController extends State { // roomAliasName: publicGroup // ? nameController.text.trim().toLowerCase().replaceAll(' ', '_') // : null, - roomAliasName: ClassCodeUtil.generateClassCode(), + roomAliasName: SpaceCodeUtil.generateSpaceCode(), // Pangea# name: nameController.text.trim(), topic: topicController.text.isEmpty ? null : topicController.text, @@ -224,15 +218,10 @@ class NewSpaceController extends State { } room.setSpaceChild(newChatRoomId, suggested: true); - newClassMode - ? GoogleAnalytics.addParent( - newChatRoomId, - room.classCode, - ) - : GoogleAnalytics.addChatToExchange( - newChatRoomId, - room.classCode, - ); + GoogleAnalytics.addParent( + newChatRoomId, + room.classCode, + ); GoogleAnalytics.createClass(room.name, room.classCode); try { @@ -267,8 +256,6 @@ class NewSpaceController extends State { // #Pangea // Widget build(BuildContext context) => NewSpaceView(this); Widget build(BuildContext context) { - newClassMode = - GoRouterState.of(context).pathParameters['newexchange'] != 'exchange'; return NewSpaceView(this); } // Pangea# diff --git a/lib/pages/new_space/new_space_view.dart b/lib/pages/new_space/new_space_view.dart index 09abb7066..f8c7baf4e 100644 --- a/lib/pages/new_space/new_space_view.dart +++ b/lib/pages/new_space/new_space_view.dart @@ -1,17 +1,14 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_capacity_button.dart'; import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart'; -import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; -import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; import 'new_space.dart'; @@ -32,29 +29,8 @@ class NewSpaceView extends StatelessWidget { appBar: AppBar( // #Pangea centerTitle: true, - title: Text( - controller.newClassMode - ? L10n.of(context)!.createNewClass - : L10n.of(context)!.newExchange, - ), - actions: [ - IconButton( - icon: const Icon(Icons.class_outlined), - selectedIcon: const Icon(Icons.class_), - color: controller.newClassMode ? activeColor : null, - isSelected: controller.newClassMode, - onPressed: () => context.go('/rooms/newspace'), - ), - IconButton( - icon: const Icon(Icons.connecting_airports), - selectedIcon: const Icon(Icons.connecting_airports), - color: !controller.newClassMode ? activeColor : null, - isSelected: !controller.newClassMode, - onPressed: () => context.go('/rooms/newspace/exchange'), - ), - ], - // title: Text(L10n.of(context)!.createNewSpace), // Pangea# + title: Text(L10n.of(context)!.createNewSpace), ), body: MaxWidthBody( child: Column( @@ -135,42 +111,48 @@ class NewSpaceView extends StatelessWidget { RoomCapacityButton( key: controller.addCapacityKey, ), - if (controller.newClassMode) - ClassSettings( - key: controller.classSettingsKey, - roomId: null, - startOpen: true, - initialSettings: - Matrix.of(context).client.lastUpdatedClassSettings, - ), - if (!controller.newClassMode) - AddToSpaceToggles( - key: controller.addToSpaceKey, - startOpen: true, - mode: !controller.newClassMode - ? AddToClassMode.exchange - : AddToClassMode.chat, - ), - FutureBuilder( - future: Matrix.of(context).client.lastUpdatedRoomRules, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.done) { - return RoomRulesEditor( - key: controller.rulesEditorKey, - roomId: null, - startOpen: false, - initialRules: snapshot.data, - ); - } else { - return const Padding( - padding: EdgeInsets.all(16.0), - child: Center( - child: CircularProgressIndicator.adaptive(strokeWidth: 2), - ), - ); - } - }, + // commenting out language settings in spaces for now + // LanguageSettings( + // key: controller.languageSettingsKey, + // roomId: null, + // startOpen: true, + // initialSettings: + // Matrix.of(context).client.lastUpdatedLanguageSettings, + // ), + AddToSpaceToggles( + key: controller.addToSpaceKey, + startOpen: true, + spaceMode: true, ), + if (controller.rulesEditorKey.currentState != null) + RoomRulesEditor( + key: controller.rulesEditorKey, + roomId: null, + startOpen: false, + initialRules: controller.rulesEditorKey.currentState!.rules, + ), + if (controller.rulesEditorKey.currentState == null) + FutureBuilder( + future: Matrix.of(context).client.lastUpdatedRoomRules, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + return RoomRulesEditor( + key: controller.rulesEditorKey, + roomId: null, + startOpen: false, + initialRules: snapshot.data, + ); + } else { + return const Padding( + padding: EdgeInsets.all(16.0), + child: Center( + child: + CircularProgressIndicator.adaptive(strokeWidth: 2), + ), + ); + } + }, + ), // SwitchListTile.adaptive( // title: Text(L10n.of(context)!.spaceIsPublic), // value: controller.publicGroup, @@ -194,12 +176,7 @@ class NewSpaceView extends StatelessWidget { children: [ Expanded( child: Text( - // #Pangea - // L10n.of(context)!.createNewSpace, - controller.newClassMode - ? L10n.of(context)!.createClass - : L10n.of(context)!.createExchange, - // Pangea# + L10n.of(context)!.createNewSpace, ), ), Icon(Icons.adaptive.arrow_forward_outlined), diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index c4a57a267..9ff495328 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -194,6 +194,12 @@ class SettingsView extends StatelessWidget { Icons.chevron_right_outlined, ), ), + ListTile( + leading: const Icon(Icons.psychology_outlined), + title: Text(L10n.of(context)!.learningSettings), + onTap: () => context.go('/rooms/settings/learning'), + trailing: const Icon(Icons.chevron_right_outlined), + ), // Pangea# ListTile( leading: const Icon(Icons.shield_outlined), diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 3d84b0e1d..a0c6a5f6b 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -6,15 +6,14 @@ import 'package:fluffychat/pangea/choreographer/controllers/alternative_translat 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/pangea_event_types.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/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.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'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; @@ -443,25 +442,15 @@ class Choreographer { } LanguageModel? get l2Lang { - return pangeaController.languageController.activeL2Model( - roomID: roomId, - ); + return pangeaController.languageController.activeL2Model(); } String? get l2LangCode => l2Lang?.langCode; LanguageModel? get l1Lang => - pangeaController.languageController.activeL1Model( - roomID: roomId, - ); - String? get l1LangCode => l1Lang?.langCode; + pangeaController.languageController.activeL1Model(); - String? get classId => roomId != null - ? pangeaController.matrixState.client - .getRoomById(roomId) - ?.firstParentWithState(PangeaEventTypes.classSettings) - ?.id - : null; + String? get l1LangCode => l1Lang?.langCode; String? get userId => pangeaController.userController.userId; @@ -582,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, -} diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index 61c8c2312..632db7e9b 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -265,7 +265,6 @@ class ITController { targetLangCode: targetLangCode, userId: choreographer.userId!, roomId: choreographer.roomId!, - classId: choreographer.classId, goldTranslation: goldRouteTracker.fullTranslation, goldContinuances: goldRouteTracker.continuances, ), @@ -283,7 +282,6 @@ class ITController { translationId: translationId, targetLangCode: targetLangCode, sourceLangCode: sourceLangCode, - classId: choreographer.classId, ), ); diff --git a/lib/pangea/choreographer/widgets/choice_array.dart b/lib/pangea/choreographer/widgets/choice_array.dart index 54fd601b9..c26fd706d 100644 --- a/lib/pangea/choreographer/widgets/choice_array.dart +++ b/lib/pangea/choreographer/widgets/choice_array.dart @@ -3,9 +3,7 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; import '../../utils/bot_style.dart'; import 'it_shimmer.dart'; @@ -18,6 +16,10 @@ class ChoicesArray extends StatelessWidget { final int? selectedChoiceIndex; final String originalSpan; final String Function(int) uniqueKeyForLayerLink; + + /// some uses of this widget want to disable the choices + final bool isActive; + const ChoicesArray({ super.key, required this.isLoading, @@ -26,6 +28,7 @@ class ChoicesArray extends StatelessWidget { required this.originalSpan, required this.uniqueKeyForLayerLink, required this.selectedChoiceIndex, + this.isActive = true, this.onLongPress, }); @@ -42,8 +45,8 @@ class ChoicesArray extends StatelessWidget { .map( (entry) => ChoiceItem( theme: theme, - onLongPress: onLongPress, - onPressed: onPressed, + onLongPress: isActive ? onLongPress : null, + onPressed: isActive ? onPressed : (_) {}, entry: entry, isSelected: selectedChoiceIndex == entry.key, ), @@ -109,19 +112,19 @@ class ChoiceItem extends StatelessWidget { : null, child: TextButton( style: ButtonStyle( - padding: MaterialStateProperty.all( + padding: WidgetStateProperty.all( const EdgeInsets.symmetric(horizontal: 7), ), //if index is selected, then give the background a slight primary color - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( entry.value.color != null ? entry.value.color!.withOpacity(0.2) : theme.colorScheme.primary.withOpacity(0.1), ), - textStyle: MaterialStateProperty.all( + textStyle: WidgetStateProperty.all( BotStyle.text(context), ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), @@ -177,21 +180,21 @@ class ChoiceAnimationWidgetState extends State ); _animation = widget.isGold - ? Tween(begin: 1.0, end: 1.2).animate(_controller) - : TweenSequence([ - TweenSequenceItem( - tween: Tween(begin: 0, end: -8 * pi / 180), - weight: 1.0, - ), - TweenSequenceItem( - tween: Tween(begin: -8 * pi / 180, end: 16 * pi / 180), - weight: 2.0, - ), - TweenSequenceItem( - tween: Tween(begin: 16 * pi / 180, end: 0), - weight: 1.0, - ), - ]).animate(_controller); + ? Tween(begin: 1.0, end: 1.2).animate(_controller) + : TweenSequence([ + TweenSequenceItem( + tween: Tween(begin: 0, end: -8 * pi / 180), + weight: 1.0, + ), + TweenSequenceItem( + tween: Tween(begin: -8 * pi / 180, end: 16 * pi / 180), + weight: 2.0, + ), + TweenSequenceItem( + tween: Tween(begin: 16 * pi / 180, end: 0), + weight: 1.0, + ), + ]).animate(_controller); if (widget.selected && !animationPlayed) { _controller.forward(); @@ -221,28 +224,28 @@ class ChoiceAnimationWidgetState extends State @override Widget build(BuildContext context) { return widget.isGold - ? AnimatedBuilder( - key: UniqueKey(), - animation: _animation, - builder: (context, child) { - return Transform.scale( - scale: _animation.value, - child: child, - ); - }, - child: widget.child, - ) - : AnimatedBuilder( - key: UniqueKey(), - animation: _animation, - builder: (context, child) { - return Transform.rotate( - angle: _animation.value, - child: child, - ); - }, - child: widget.child, - ); + ? AnimatedBuilder( + key: UniqueKey(), + animation: _animation, + builder: (context, child) { + return Transform.scale( + scale: _animation.value, + child: child, + ); + }, + child: widget.child, + ) + : AnimatedBuilder( + key: UniqueKey(), + animation: _animation, + builder: (context, child) { + return Transform.rotate( + angle: _animation.value, + child: child, + ); + }, + child: widget.child, + ); } @override diff --git a/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart b/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart index 9d3302910..0abe90925 100644 --- a/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart +++ b/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart @@ -2,7 +2,7 @@ import 'dart:developer'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; diff --git a/lib/pangea/choreographer/widgets/start_igc_button.dart b/lib/pangea/choreographer/widgets/start_igc_button.dart index ceb5af193..877158dd2 100644 --- a/lib/pangea/choreographer/widgets/start_igc_button.dart +++ b/lib/pangea/choreographer/widgets/start_igc_button.dart @@ -1,10 +1,10 @@ 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'; @@ -53,15 +53,15 @@ class StartIGCButtonState extends State 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) { @@ -77,92 +77,67 @@ class StartIGCButtonState extends State return SizedBox( height: 50, width: 50, - child: FloatingActionButton( - tooltip: assistanceState.tooltip( - L10n.of(context)!, - ), - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - disabledElevation: 0, - shape: const CircleBorder(), - onPressed: () { - if (assistanceState != AssistanceState.complete) { - widget.controller.choreographer - .getLanguageHelp( - false, - true, - ) - .then((_) { - if (widget.controller.choreographer.igc.igcTextData != null && - widget.controller.choreographer.igc.igcTextData!.matches - .isNotEmpty) { - widget.controller.choreographer.igc.showFirstMatch(context); - } - }); - } - }, - child: Stack( - alignment: Alignment.center, - children: [ - _controller != null - ? RotationTransition( - turns: Tween(begin: 0.0, end: math.pi * 2) - .animate(_controller!), - child: icon, - ) - : icon, - Container( - width: 26, - height: 26, - decoration: BoxDecoration( - shape: BoxShape.circle, + child: InkWell( + customBorder: const CircleBorder(), + onLongPress: () => pLanguageDialog(context, () {}), + child: FloatingActionButton( + tooltip: assistanceState.tooltip( + L10n.of(context)!, + ), + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + disabledElevation: 0, + shape: const CircleBorder(), + onPressed: () { + if (assistanceState != AssistanceState.fetching) { + widget.controller.choreographer + .getLanguageHelp( + false, + true, + ) + .then((_) { + if (widget.controller.choreographer.igc.igcTextData != null && + widget.controller.choreographer.igc.igcTextData!.matches + .isNotEmpty) { + widget.controller.choreographer.igc.showFirstMatch(context); + } + }); + } + }, + child: Stack( + alignment: Alignment.center, + children: [ + _controller != null + ? RotationTransition( + turns: Tween(begin: 0.0, end: math.pi * 2) + .animate(_controller!), + child: icon, + ) + : icon, + Container( + width: 26, + height: 26, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Theme.of(context).scaffoldBackgroundColor, + ), + ), + Container( + width: 20, + height: 20, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: assistanceState.stateColor(context), + ), + ), + Icon( + size: 16, + Icons.check, color: Theme.of(context).scaffoldBackgroundColor, ), - ), - Container( - width: 20, - height: 20, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: assistanceState.stateColor(context), - ), - ), - Icon( - size: 16, - Icons.check, - color: Theme.of(context).scaffoldBackgroundColor, - ), - ], + ], + ), ), ), ); } } - -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; - } - } -} diff --git a/lib/pangea/constants/model_keys.dart b/lib/pangea/constants/model_keys.dart index 0cd14e5a4..c85c8a7bd 100644 --- a/lib/pangea/constants/model_keys.dart +++ b/lib/pangea/constants/model_keys.dart @@ -27,11 +27,8 @@ class ModelKey { static const String clientIsPublic = "isPublic"; static const String clientIsOpenEnrollment = 'isOpenEnrollment'; - static const String clientIsOpenExchange = 'isOpenExchange'; static const String clientIsOneToOneChatClass = 'oneToOneChatClass'; - static const String clientIsOneToOneChatExchange = 'oneToOneChatExchange'; static const String clientIsCreateRooms = 'isCreateRooms'; - static const String clientIsCreateRoomsExchange = 'isCreateRoomsExchange'; static const String clientIsShareVideo = 'isShareVideo'; static const String clientIsSharePhoto = 'isSharePhoto'; static const String clientIsShareFiles = 'isShareFiles'; @@ -39,7 +36,6 @@ class ModelKey { static const String clientIsCreateStories = 'isCreateStories'; static const String clientIsVoiceNotes = 'isVoiceNotes'; static const String clientIsInviteOnlyStudents = 'isInviteOnlyStudents'; - static const String clientIsInviteOnlyExchanges = 'isInviteOnlyExchanges'; static const String userL1 = "user_l1"; static const String userL2 = "user_l2"; diff --git a/lib/pangea/constants/pangea_event_types.dart b/lib/pangea/constants/pangea_event_types.dart index a182728dd..27b177a35 100644 --- a/lib/pangea/constants/pangea_event_types.dart +++ b/lib/pangea/constants/pangea_event_types.dart @@ -1,6 +1,5 @@ class PangeaEventTypes { - static const classSettings = "pangea.class"; - static const pangeaExchange = "p.exchange"; + static const languageSettings = "pangea.class"; static const transcript = "pangea.transcript"; @@ -26,4 +25,8 @@ class PangeaEventTypes { static const String report = 'm.report'; static const textToSpeechRule = "p.rule.text_to_speech"; + + static const pangeaActivityRes = "pangea.activity_res"; + static const acitivtyRequest = "pangea.activity_req"; + static const activityRecord = "pangea.activity_completion"; } diff --git a/lib/pangea/constants/pangea_room_types.dart b/lib/pangea/constants/pangea_room_types.dart index dcceadd36..804d2be86 100644 --- a/lib/pangea/constants/pangea_room_types.dart +++ b/lib/pangea/constants/pangea_room_types.dart @@ -1,4 +1,3 @@ class PangeaRoomTypes { static const analytics = 'p.analytics'; - static const exchange = 'p.exchange'; } diff --git a/lib/pangea/controllers/class_controller.dart b/lib/pangea/controllers/class_controller.dart index a3f1aa268..b4bc18b87 100644 --- a/lib/pangea/controllers/class_controller.dart +++ b/lib/pangea/controllers/class_controller.dart @@ -7,9 +7,9 @@ import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; -import 'package:fluffychat/pangea/utils/class_code.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/pangea/utils/space_code.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -34,8 +34,8 @@ class ClassController extends BaseController { Future fixClassPowerLevels() async { try { - final teacherSpaces = await _pangeaController - .matrixState.client.classesAndExchangesImTeaching; + final teacherSpaces = + await _pangeaController.matrixState.client.spacesImTeaching; final List> classFixes = List.from(teacherSpaces) .map((adminSpace) => adminSpace.setClassPowerLevels()) .toList(); @@ -64,7 +64,7 @@ class ClassController extends BaseController { classCode, ).onError( (error, stackTrace) => - ClassCodeUtil.messageSnack(context, ErrorCopy(context, error).body), + SpaceCodeUtil.messageSnack(context, ErrorCopy(context, error).body), ); } } @@ -77,8 +77,7 @@ class ClassController extends BaseController { if (!room.isDirectChat) return []; final List existingParentsIds = room.pangeaSpaceParents.map((e) => e.id).toList(); - final List spaces = - _pangeaController.matrixState.client.classesAndExchangesImIn; + final List spaces = _pangeaController.matrixState.client.spacesImIn; //make sure we have the latest participants await Future.wait(spaces.map((e) => e.requestParticipants())); @@ -120,7 +119,7 @@ class ClassController extends BaseController { }); if (classChunk == null) { - ClassCodeUtil.messageSnack( + SpaceCodeUtil.messageSnack( context, L10n.of(context)!.unableToFindClass, ); @@ -130,7 +129,7 @@ class ClassController extends BaseController { if (_pangeaController.matrixState.client.rooms .any((room) => room.id == classChunk.roomId)) { setActiveSpaceIdInChatListController(classChunk.roomId); - ClassCodeUtil.messageSnack(context, L10n.of(context)!.alreadyInClass); + SpaceCodeUtil.messageSnack(context, L10n.of(context)!.alreadyInClass); return; } @@ -169,9 +168,6 @@ class ClassController extends BaseController { final Room? joinedSpace = _pangeaController.matrixState.client.getRoomById(classChunk.roomId); - // ensure that the user has an analytics room for this space's language - await joinedSpace?.ensureAnalyticsRoomExists(); - // when possible, add user's analytics room the to space they joined await joinedSpace?.addAnalyticsRoomsToSpace(); @@ -180,7 +176,7 @@ class ClassController extends BaseController { GoogleAnalytics.joinClass(classCode); return; } catch (err) { - ClassCodeUtil.messageSnack( + SpaceCodeUtil.messageSnack( context, ErrorCopy(context, err).body, ); @@ -198,7 +194,7 @@ class ClassController extends BaseController { final Room? room = _pangeaController.matrixState.client.getRoomById(roomId); if (room == null) return; - if (room.classSettings != null && room.pangeaRoomRules == null) { + if (room.isSpace && room.isRoomAdmin && room.pangeaRoomRules == null) { try { await _pangeaController.matrixState.client.setRoomStateWithKey( roomId, diff --git a/lib/pangea/controllers/language_controller.dart b/lib/pangea/controllers/language_controller.dart index e11053fe2..c906e6b4e 100644 --- a/lib/pangea/controllers/language_controller.dart +++ b/lib/pangea/controllers/language_controller.dart @@ -3,12 +3,9 @@ import 'dart:developer'; import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; import '../widgets/user_settings/p_language_dialog.dart'; @@ -63,50 +60,51 @@ class LanguageController { return _userL2Code != null ? PangeaLanguage.byLangCode(_userL2Code!) : null; } - String? activeL1Code({String? roomID}) { - final String? activeL2 = activeL2Code(roomID: roomID); - if (roomID == null || activeL2 != _userL1Code) { - return _userL1Code; - } - final ClassSettingsModel? classContext = _pangeaController - .matrixState.client - .getRoomById(roomID) - ?.firstLanguageSettings; - final String? classL1 = classContext?.dominantLanguage; - if (classL1 == LanguageKeys.mixedLanguage || - classL1 == LanguageKeys.multiLanguage || - classL1 == null) { - if (_userL2Code != _userL1Code) { - return _userL2Code; - } - return LanguageKeys.unknownLanguage; - } - return classL1; + String? activeL1Code() { + return _userL1Code; + // final String? activeL2 = activeL2Code(roomID: roomID); + // if (roomID == null || activeL2 != _userL1Code) { + // return _userL1Code; + // } + // final LanguageSettingsModel? classContext = _pangeaController + // .matrixState.client + // .getRoomById(roomID) + // ?.firstLanguageSettings; + // final String? classL1 = classContext?.dominantLanguage; + // if (classL1 == LanguageKeys.mixedLanguage || + // classL1 == LanguageKeys.multiLanguage || + // classL1 == null) { + // if (_userL2Code != _userL1Code) { + // return _userL2Code; + // } + // return LanguageKeys.unknownLanguage; + // } + // return classL1; } /// Class languages override user languages within a class context - String? activeL2Code({String? roomID}) { - if (roomID == null) { - return _userL2Code; - } - final ClassSettingsModel? classContext = _pangeaController - .matrixState.client - .getRoomById(roomID) - ?.firstLanguageSettings; - return classContext?.targetLanguage ?? _userL2Code; + String? activeL2Code() { + return _userL2Code; + // if (roomID == null) { + // return _userL2Code; + // } + // final LanguageSettingsModel? classContext = _pangeaController + // .matrixState.client + // .getRoomById(roomID) + // ?.firstLanguageSettings; + // return classContext?.targetLanguage ?? _userL2Code; } - LanguageModel? activeL1Model({String? roomID}) { - final activeL1 = activeL1Code(roomID: roomID); - return activeL1 != null ? PangeaLanguage.byLangCode(activeL1) : null; + LanguageModel? activeL1Model() { + return userL1; + // final activeL1 = activeL1Code(roomID: roomID); + // return activeL1 != null ? PangeaLanguage.byLangCode(activeL1) : null; } - LanguageModel? activeL2Model({String? roomID}) { - final activeL2 = activeL2Code(roomID: roomID); - final model = activeL2 != null ? PangeaLanguage.byLangCode(activeL2) : null; - return model; + LanguageModel? activeL2Model() { + return userL2; + // final activeL2 = activeL2Code(roomID: roomID); + // final model = activeL2 != null ? PangeaLanguage.byLangCode(activeL2) : null; + // return model; } - - bool equalActiveL1AndActiveL2({Room? room}) => - activeL1Code() == activeL2Code(roomID: room?.id); } diff --git a/lib/pangea/controllers/language_list_controller.dart b/lib/pangea/controllers/language_list_controller.dart index 345d5b5e7..59c3cce88 100644 --- a/lib/pangea/controllers/language_list_controller.dart +++ b/lib/pangea/controllers/language_list_controller.dart @@ -27,7 +27,7 @@ class PangeaLanguage { static Future initialize() async { try { - _langList = await _getCahedFlags(); + _langList = await _getCachedFlags(); if (await _shouldFetch || _langList.isEmpty) { _langList = await LanguageRepo.fetchLanguages(); @@ -77,7 +77,7 @@ class PangeaLanguage { await MyShared.saveJson(PrefKey.flags, flagMap); } - static Future> _getCahedFlags() async { + static Future> _getCachedFlags() async { final Map? flagsMap = await MyShared.readJson(PrefKey.flags); if (flagsMap == null) { diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart index 2dc30cfe7..95b88ae14 100644 --- a/lib/pangea/controllers/local_settings.dart +++ b/lib/pangea/controllers/local_settings.dart @@ -1,5 +1,5 @@ import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; class LocalSettings { late PangeaController _pangeaController; diff --git a/lib/pangea/controllers/message_analytics_controller.dart b/lib/pangea/controllers/message_analytics_controller.dart index c0c8ecd1a..7083efbfd 100644 --- a/lib/pangea/controllers/message_analytics_controller.dart +++ b/lib/pangea/controllers/message_analytics_controller.dart @@ -4,11 +4,13 @@ import 'dart:developer'; import 'package:collection/collection.dart'; import 'package:fluffychat/pangea/constants/match_rule_ids.dart'; import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; +import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; import 'package:fluffychat/pangea/enum/time_span.dart'; import 'package:fluffychat/pangea/models/analytics/analytics_event.dart'; import 'package:fluffychat/pangea/models/analytics/constructs_event.dart'; import 'package:fluffychat/pangea/models/analytics/summary_analytics_event.dart'; +import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; @@ -62,6 +64,33 @@ class AnalyticsController extends BaseController { ); } + ///////// SPACE ANALYTICS LANGUAGES ////////// + String get _analyticsSpaceLangKey => "ANALYTICS_SPACE_LANG_KEY"; + + LanguageModel get currentAnalyticsSpaceLang { + try { + final String? str = _pangeaController.pStoreService.read( + _analyticsSpaceLangKey, + local: true, + ); + return str != null + ? PangeaLanguage.byLangCode(str) + : _pangeaController.languageController.userL2 ?? + _pangeaController.pLanguageStore.targetOptions.first; + } catch (err) { + debugger(when: kDebugMode); + return _pangeaController.pLanguageStore.targetOptions.first; + } + } + + Future setCurrentAnalyticsSpaceLang(LanguageModel lang) async { + await _pangeaController.pStoreService.save( + _analyticsSpaceLangKey, + lang.langCode, + local: true, + ); + } + Future myAnalyticsLastUpdated(String type) async { // given an analytics event type, get the last updated times // for each of the user's analytics rooms and return the most recent @@ -96,7 +125,6 @@ class AnalyticsController extends BaseController { Future spaceAnalyticsLastUpdated( String type, Room space, - String langCode, ) async { // check if any students have recently updated their analytics // if any have, then the cache needs to be updated @@ -106,7 +134,7 @@ class AnalyticsController extends BaseController { final List> lastUpdatedFutures = []; for (final student in space.students) { final Room? analyticsRoom = _pangeaController.matrixState.client - .analyticsRoomLocal(langCode, student.id); + .analyticsRoomLocal(currentAnalyticsSpaceLang.langCode, student.id); if (analyticsRoom == null) continue; lastUpdatedFutures.add( analyticsRoom.analyticsLastUpdated( @@ -132,11 +160,21 @@ class AnalyticsController extends BaseController { // private chat analytics to determine which children are already visible // in the chat list final Map> _lastFetchedHierarchies = {}; + void setLatestHierarchy(String spaceId, GetSpaceHierarchyResponse resp) { final List roomIds = resp.rooms.map((room) => room.roomId).toList(); _lastFetchedHierarchies[spaceId] = roomIds; } + Future> getLatestSpaceHierarchy(String spaceId) async { + if (!_lastFetchedHierarchies.containsKey(spaceId)) { + final resp = + await _pangeaController.matrixState.client.getSpaceHierarchy(spaceId); + setLatestHierarchy(spaceId, resp); + } + return _lastFetchedHierarchies[spaceId] ?? []; + } + //////////////////////////// MESSAGE SUMMARY ANALYTICS //////////////////////////// Future> mySummaryAnalytics() async { @@ -168,9 +206,6 @@ class AnalyticsController extends BaseController { ) async { // gets all the summary analytics events for the students // in a space since the current timespace's cut off date - final langCode = _pangeaController.languageController.activeL2Code( - roomID: space.id, - ); // ensure that all the space's events are loaded (mainly the for langCode) // and that the participants are loaded @@ -181,7 +216,7 @@ class AnalyticsController extends BaseController { final List analyticsEvents = []; for (final student in space.students) { final Room? analyticsRoom = _pangeaController.matrixState.client - .analyticsRoomLocal(langCode, student.id); + .analyticsRoomLocal(currentAnalyticsSpaceLang.langCode, student.id); if (analyticsRoom != null) { final List? roomEvents = @@ -225,7 +260,8 @@ class AnalyticsController extends BaseController { (e.defaultSelected.id == defaultSelected.id) && (e.defaultSelected.type == defaultSelected.type) && (e.selected?.id == selected?.id) && - (e.selected?.type == selected?.type), + (e.selected?.type == selected?.type) && + (e.langCode == currentAnalyticsSpaceLang.langCode), ); if (index != -1) { @@ -253,6 +289,7 @@ class AnalyticsController extends BaseController { chartAnalyticsModel: chartAnalyticsModel, defaultSelected: defaultSelected, selected: selected, + langCode: currentAnalyticsSpaceLang.langCode, ), ); } @@ -267,16 +304,16 @@ class AnalyticsController extends BaseController { return filtered; } - List filterRoomAnalytics( + Future> filterRoomAnalytics( List unfiltered, String? roomID, - ) { + ) async { List filtered = [...unfiltered]; Room? room; if (roomID != null) { room = _pangeaController.matrixState.client.getRoomById(roomID); if (room?.isSpace == true) { - return filterSpaceAnalytics(unfiltered, roomID); + return await filterSpaceAnalytics(unfiltered, roomID); } } @@ -295,16 +332,10 @@ class AnalyticsController extends BaseController { Future> filterPrivateChatAnalytics( List unfiltered, - Room? space, + Room space, ) async { - if (space != null && !_lastFetchedHierarchies.containsKey(space.id)) { - final resp = await _pangeaController.matrixState.client - .getSpaceHierarchy(space.id); - setLatestHierarchy(space.id, resp); - } - - final List privateChatIds = space?.allSpaceChildRoomIds ?? []; - final List lastFetched = _lastFetchedHierarchies[space!.id] ?? []; + final List privateChatIds = space.allSpaceChildRoomIds; + final List lastFetched = await getLatestSpaceHierarchy(space.id); for (final id in lastFetched) { privateChatIds.removeWhere((e) => e == id); } @@ -324,19 +355,11 @@ class AnalyticsController extends BaseController { return filtered; } - List filterSpaceAnalytics( + Future> filterSpaceAnalytics( List unfiltered, String spaceId, - ) { - final selectedSpace = - _pangeaController.matrixState.client.getRoomById(spaceId); - final List chatIds = selectedSpace?.spaceChildren - .map((e) => e.roomId) - .where((e) => e != null) - .cast() - .toList() ?? - []; - + ) async { + final List chatIds = await getLatestSpaceHierarchy(spaceId); List filtered = List.from(unfiltered); @@ -384,12 +407,15 @@ class AnalyticsController extends BaseController { if (defaultSelected.type == AnalyticsEntryType.student) { throw "private chat filtering not available for my analytics"; } + if (space == null) { + throw "space is null in filterAnalytics with selected type privateChats"; + } return await filterPrivateChatAnalytics( unfilteredAnalytics, space, ); case AnalyticsEntryType.space: - return filterSpaceAnalytics(unfilteredAnalytics, selected!.id); + return await filterSpaceAnalytics(unfilteredAnalytics, selected!.id); default: throw Exception("invalid filter type - ${selected?.type}"); } @@ -405,7 +431,6 @@ class AnalyticsController extends BaseController { // if the user is looking at space analytics, then fetch the space Room? space; - String? langCode; if (defaultSelected.type == AnalyticsEntryType.space) { space = _pangeaController.matrixState.client.getRoomById( defaultSelected.id, @@ -423,23 +448,7 @@ class AnalyticsController extends BaseController { timeSpan: currentAnalyticsTimeSpan, ); } - await space.postLoad(); - langCode = _pangeaController.languageController.activeL2Code( - roomID: space.id, - ); - if (langCode == null) { - ErrorHandler.logError( - m: "langCode missing in getAnalytics", - data: { - "space": space, - }, - ); - return ChartAnalyticsModel( - msgs: [], - timeSpan: currentAnalyticsTimeSpan, - ); - } } DateTime? lastUpdated; @@ -456,7 +465,6 @@ class AnalyticsController extends BaseController { lastUpdated = await spaceAnalyticsLastUpdated( PangeaEventTypes.summaryAnalytics, space!, - langCode!, ); } @@ -467,8 +475,10 @@ class AnalyticsController extends BaseController { lastUpdated: lastUpdated, ); if (local != null && !forceUpdate) { + debugPrint("returning local analytics"); return local; } + debugPrint("fetching new analytics"); // get all the relevant summary analytics events for the current timespan final List summaryEvents = @@ -548,24 +558,10 @@ class AnalyticsController extends BaseController { ) async { await space.postLoad(); await space.requestParticipants(); - final String? langCode = _pangeaController.languageController.activeL2Code( - roomID: space.id, - ); - - if (langCode == null) { - ErrorHandler.logError( - m: "langCode missing in allSpaceMemberConstructs", - data: { - "space": space, - }, - ); - return []; - } - final List constructEvents = []; for (final student in space.students) { final Room? analyticsRoom = _pangeaController.matrixState.client - .analyticsRoomLocal(langCode, student.id); + .analyticsRoomLocal(currentAnalyticsSpaceLang.langCode, student.id); if (analyticsRoom != null) { final List? roomEvents = (await analyticsRoom.getAnalyticsEvents( @@ -614,31 +610,30 @@ class AnalyticsController extends BaseController { return filtered; } - List filterPrivateChatConstructs( + Future> filterPrivateChatConstructs( List unfilteredConstructs, - Room parentSpace, - ) { - final List directChatIds = []; + Room space, + ) async { + final List privateChatIds = space.allSpaceChildRoomIds; + final List lastFetched = await getLatestSpaceHierarchy(space.id); + for (final id in lastFetched) { + privateChatIds.removeWhere((e) => e == id); + } final List filtered = List.from(unfilteredConstructs); for (final construct in filtered) { construct.content.uses.removeWhere( - (use) => !directChatIds.contains(use.chatId), + (use) => !privateChatIds.contains(use.chatId), ); } return filtered; } - List filterSpaceConstructs( + Future> filterSpaceConstructs( List unfilteredConstructs, Room space, - ) { - final List chatIds = space.spaceChildren - .map((e) => e.roomId) - .where((e) => e != null) - .cast() - .toList(); - + ) async { + final List chatIds = await getLatestSpaceHierarchy(space.id); final List filtered = List.from(unfilteredConstructs); @@ -665,7 +660,8 @@ class AnalyticsController extends BaseController { e.defaultSelected.id == defaultSelected.id && e.defaultSelected.type == defaultSelected.type && e.selected?.id == selected?.id && - e.selected?.type == selected?.type, + e.selected?.type == selected?.type && + e.langCode == currentAnalyticsSpaceLang.langCode, ); if (index > -1) { @@ -691,6 +687,7 @@ class AnalyticsController extends BaseController { events: List.from(events), defaultSelected: defaultSelected, selected: selected, + langCode: currentAnalyticsSpaceLang.langCode, ); _cachedConstructs.add(entry); } @@ -769,9 +766,9 @@ class AnalyticsController extends BaseController { case AnalyticsEntryType.privateChats: return defaultSelected.type == AnalyticsEntryType.student ? throw "private chat filtering not available for my analytics" - : filterPrivateChatConstructs(unfilteredConstructs, space!); + : await filterPrivateChatConstructs(unfilteredConstructs, space!); case AnalyticsEntryType.space: - return filterSpaceConstructs(unfilteredConstructs, space!); + return await filterSpaceConstructs(unfilteredConstructs, space!); default: throw Exception("invalid filter type - ${selected?.type}"); } @@ -784,10 +781,10 @@ class AnalyticsController extends BaseController { bool removeIT = true, bool forceUpdate = false, }) async { + debugPrint("getting constructs"); await _pangeaController.matrixState.client.roomsLoading; Room? space; - String? langCode; if (defaultSelected.type == AnalyticsEntryType.space) { space = _pangeaController.matrixState.client.getRoomById( defaultSelected.id, @@ -803,18 +800,6 @@ class AnalyticsController extends BaseController { return []; } await space.postLoad(); - langCode = _pangeaController.languageController.activeL2Code( - roomID: space.id, - ); - if (langCode == null) { - ErrorHandler.logError( - m: "langCode missing in setConstructs", - data: { - "space": space, - }, - ); - return []; - } } DateTime? lastUpdated; @@ -831,7 +816,6 @@ class AnalyticsController extends BaseController { lastUpdated = await spaceAnalyticsLastUpdated( PangeaEventTypes.construct, space!, - langCode!, ); } @@ -843,8 +827,10 @@ class AnalyticsController extends BaseController { lastUpdated: lastUpdated, ); if (local != null && !forceUpdate) { + debugPrint("returning local constructs"); return local; } + debugPrint("fetching new constructs"); final filteredConstructs = space == null ? await getMyConstructs( @@ -884,6 +870,7 @@ class AnalyticsController extends BaseController { } abstract class CacheEntry { + final String langCode; final TimeSpan timeSpan; final AnalyticsSelected defaultSelected; AnalyticsSelected? selected; @@ -892,6 +879,7 @@ abstract class CacheEntry { CacheEntry({ required this.timeSpan, required this.defaultSelected, + required this.langCode, this.selected, }) { _createdAt = DateTime.now(); @@ -924,17 +912,19 @@ class ConstructCacheEntry extends CacheEntry { required this.type, required this.events, required super.timeSpan, + required super.langCode, required super.defaultSelected, super.selected, }); } class AnalyticsCacheModel extends CacheEntry { - ChartAnalyticsModel chartAnalyticsModel; + final ChartAnalyticsModel chartAnalyticsModel; AnalyticsCacheModel({ required this.chartAnalyticsModel, required super.timeSpan, + required super.langCode, required super.defaultSelected, super.selected, }); diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart index 4a0668880..7b3a3e6d2 100644 --- a/lib/pangea/controllers/message_data_controller.dart +++ b/lib/pangea/controllers/message_data_controller.dart @@ -176,14 +176,20 @@ class MessageDataController extends BaseController { required String target, required Room room, }) async { + if (_pangeaController.languageController.userL2 == null || + _pangeaController.languageController.userL1 == null) { + ErrorHandler.logError( + e: "userL1 or userL2 is null in _getPangeaRepresentation", + s: StackTrace.current, + ); + return null; + } final req = FullTextTranslationRequestModel( text: text, tgtLang: target, srcLang: source, - userL2: - _pangeaController.languageController.activeL2Code(roomID: room.id)!, - userL1: - _pangeaController.languageController.activeL1Code(roomID: room.id)!, + userL2: _pangeaController.languageController.userL2!.langCode, + userL1: _pangeaController.languageController.userL1!.langCode, ); try { diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index 77a644863..614fcf9db 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -1,13 +1,16 @@ import 'dart:async'; import 'dart:developer'; +import 'package:fluffychat/pangea/constants/language_keys.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'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; -import 'package:fluffychat/pangea/models/analytics/analytics_event.dart'; -import 'package:fluffychat/pangea/models/analytics/analytics_model.dart'; +import 'package:fluffychat/pangea/models/analytics/constructs_event.dart'; +import 'package:fluffychat/pangea/models/analytics/constructs_model.dart'; +import 'package:fluffychat/pangea/models/analytics/summary_analytics_event.dart'; +import 'package:fluffychat/pangea/models/analytics/summary_analytics_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:matrix/matrix.dart'; @@ -22,20 +25,23 @@ class MyAnalyticsController extends BaseController { final int _maxMessagesCached = 10; final int _minutesBeforeUpdate = 5; + /// the time since the last update that will trigger an automatic update + final Duration _timeSinceUpdate = const Duration(days: 1); + MyAnalyticsController(PangeaController pangeaController) { _pangeaController = pangeaController; } - // adds the listener that handles when to run automatic updates - // to analytics - either after a certain number of messages sent/ - // received or after a certain amount of time without an update + /// adds the listener that handles when to run automatic updates + /// to analytics - either after a certain number of messages sent/ + /// received or after a certain amount of time [_timeSinceUpdate] without an update Future addEventsListener() async { final Client client = _pangeaController.matrixState.client; // if analytics haven't been updated in the last day, update them DateTime? lastUpdated = await _pangeaController.analytics .myAnalyticsLastUpdated(PangeaEventTypes.summaryAnalytics); - final DateTime yesterday = DateTime.now().subtract(const Duration(days: 1)); + final DateTime yesterday = DateTime.now().subtract(_timeSinceUpdate); if (lastUpdated?.isBefore(yesterday) ?? true) { debugPrint("analytics out-of-date, updating"); await updateAnalytics(); @@ -50,9 +56,9 @@ class MyAnalyticsController extends BaseController { }); } - // given an update from sync stream, check if the update contains - // messages for which analytics will be saved. If so, reset the timer - // and add the event ID to the cache of un-added event IDs + /// given an update from sync stream, check if the update contains + /// messages for which analytics will be saved. If so, reset the timer + /// and add the event ID to the cache of un-added event IDs void updateAnalyticsTimer(SyncUpdate update, DateTime? lastUpdated) { for (final entry in update.rooms!.join!.entries) { final Room room = @@ -157,6 +163,7 @@ class MyAnalyticsController extends BaseController { _updateCompleter = Completer(); try { await _updateAnalytics(); + clearMessagesSinceUpdate(); } catch (err, s) { ErrorHandler.logError( e: err, @@ -169,126 +176,148 @@ class MyAnalyticsController extends BaseController { } } + // top level analytics sending function. Send analytics + // for each type of analytics event + // to each of the applicable analytics rooms Future _updateAnalytics() async { - // top level analytics sending function. Send analytics - // for each type of analytics event - // to each of the applicable analytics rooms - clearMessagesSinceUpdate(); + // if the user's l2 is not sent, don't send analytics + final String? userL2 = _pangeaController.languageController.activeL2Code(); + if (userL2 == null) { + return; + } // fetch a list of all the chats that the user is studying // and a list of all the spaces in which the user is studying await setStudentChats(); await setStudentSpaces(); - // get all the analytics rooms that the user has - // and create any missing analytics rooms (if the user is studying - // in a class but doesn't have an analytics room for that class's L2) - final List analyticsRooms = - _pangeaController.matrixState.client.allMyAnalyticsRooms; - analyticsRooms.addAll(await createMissingAnalyticsRooms()); + // get the last updated time for each analytics room + // and the least recent update, which will be used to determine + // how far to go back in the chat history to get messages + final Map lastUpdatedMap = await _pangeaController + .matrixState.client + .allAnalyticsRoomsLastUpdated(); + final List lastUpdates = lastUpdatedMap.values + .where((lastUpdate) => lastUpdate != null) + .cast() + .toList(); - // finally, send an analytics event for each analytics room and - // each type of analytics event - for (final Room analyticsRoom in analyticsRooms) { - for (final String type in AnalyticsEvent.analyticsEventTypes) { - await sendAnalyticsEvent(analyticsRoom, type); - } + /// Get the last time that analytics to for current target language + /// were updated. This my present a problem is the user has analytics + /// rooms for multiple languages, and a non-target language was updated + /// less recently than the target language. In this case, some data may + /// be missing, but a case like that seems relatively rare, and could + /// result in unnecessaily going too far back in the chat history + DateTime? l2AnalyticsLastUpdated = lastUpdatedMap[userL2]; + if (l2AnalyticsLastUpdated == null) { + /// if the target language has never been updated, use the least + /// recent update time + lastUpdates.sort((a, b) => a.compareTo(b)); + l2AnalyticsLastUpdated = + lastUpdates.isNotEmpty ? lastUpdates.first : null; + } + + // for each chat the user is studying in, get all the messages + // since the least recent update analytics update, and sort them + // by their langCodes + final Map> langCodeToMsgs = + await getLangCodesToMsgs( + userL2, + l2AnalyticsLastUpdated, + ); + + final List langCodes = langCodeToMsgs.keys.toList(); + for (final String langCode in langCodes) { + // for each of the langs that the user has sent message in, get + // the corresponding analytics room (or create it) + final Room analyticsRoom = await _pangeaController.matrixState.client + .getMyAnalyticsRoom(langCode); + + // if there is no analytics room for this langCode, then user hadn't sent + // message in this language at the time of the last analytics update + // so fallback to the least recent update time + final DateTime? lastUpdated = + lastUpdatedMap[analyticsRoom.id] ?? l2AnalyticsLastUpdated; + + // get the corresponding list of recent messages for this langCode + final List recentMsgs = + langCodeToMsgs[langCode] ?? []; + + // finally, send the analytics events to the analytics room + await sendAnalyticsEvents( + analyticsRoom, + recentMsgs, + lastUpdated, + ); } } - Future sendAnalyticsEvent( - Room analyticsRoom, - String type, + Future>> getLangCodesToMsgs( + String userL2, + DateTime? since, ) async { - // given an analytics room for a language and a type of analytics event - // gathers all the relevant data and sends it to the analytics room - - // get the language code for the analytics room - final String? langCode = analyticsRoom.madeForLang; - if (langCode == null) { - ErrorHandler.logError( - e: "no lang code found for analytics room: ${analyticsRoom.id}", - s: StackTrace.current, - ); - return; - } - - // get the last time an analytics event of this type was sent to this room - final DateTime? lastUpdated = await analyticsRoom.analyticsLastUpdated( - type, - _pangeaController.matrixState.client.userID!, - ); - - // each type of analytics event has a format for storing per-message data - // for SummaryAnalytics events, this is RecentMessageRecord - // for Construct events, this is OneConstructUse - // analyticsContent is a list of these formatted data - final List analyticsContent = []; - + // get a map of langCodes to messages for each chat the user is studying in + final Map> langCodeToMsgs = {}; for (final Room chat in _studentChats) { - // for each chat the student studies in, check if the langCode - // matches the langCode of the analytics room - final String? chatLangCode = - _pangeaController.languageController.activeL2Code(roomID: chat.id); - if (chatLangCode != langCode) continue; - - // get messages the logged in user has sent in all chats - // since the last analytics event was sent List? recentMsgs; try { recentMsgs = await chat.myMessageEventsInChat( - since: lastUpdated, + since: since, ); } catch (err) { debugPrint("failed to fetch messages for chat ${chat.id}"); continue; } - if (lastUpdated != null) { - recentMsgs.removeWhere( - (msg) => msg.event.originServerTs.isBefore(lastUpdated), - ); + // sort those messages by their langCode + // langCode is hopefully based on the original sent rep, but if that + // is null or unk, it will be based on the user's current l2 + for (final msg in recentMsgs) { + final String msgLangCode = (msg.originalSent?.langCode != null && + msg.originalSent?.langCode != LanguageKeys.unknownLanguage) + ? msg.originalSent!.langCode + : userL2; + langCodeToMsgs[msgLangCode] ??= []; + langCodeToMsgs[msgLangCode]!.add(msg); } + } + return langCodeToMsgs; + } - // then format that data into analytics data and add the formatted - // data to the list of analyticsContent - analyticsContent.addAll( - AnalyticsModel.formatAnalyticsContent(recentMsgs, type), + Future sendAnalyticsEvents( + Room analyticsRoom, + List recentMsgs, + DateTime? lastUpdated, + ) async { + // remove messages that were sent before the last update + if (recentMsgs.isEmpty) return; + if (lastUpdated != null) { + recentMsgs.removeWhere( + (msg) => msg.event.originServerTs.isBefore(lastUpdated), ); } - // send the analytics data to the analytics room - // if there is no data to send, don't send an event, - // unless no events have been sent yet. In that case, send an event - // with no data to indicate that the the system checked for data - // and found none, so the system doesn't repeatedly check for data - if (analyticsContent.isEmpty && lastUpdated != null) return; - await AnalyticsEvent.sendEvent( - analyticsRoom, - type, - analyticsContent, - ); - } + // format the analytics data + final List summaryContent = + SummaryAnalyticsModel.formatSummaryContent(recentMsgs); + final List constructContent = + ConstructAnalyticsModel.formatConstructsContent(recentMsgs); - // on the off chance that the user is in a class but doesn't have an analytics - // room for the target language of that class, create the analytics room(s) - Future> createMissingAnalyticsRooms() async { - List targetLangs = []; - final String? userL2 = _pangeaController.languageController.activeL2Code(); - if (userL2 != null) targetLangs.add(userL2); - final List spaceL2s = studentSpaces - .map( - (space) => _pangeaController.languageController.activeL2Code( - roomID: space.id, - ), - ) - .toList(); - targetLangs.addAll(spaceL2s.where((l2) => l2 != null).cast()); - targetLangs = targetLangs.toSet().toList(); - for (final String langCode in targetLangs) { - await _pangeaController.matrixState.client.getMyAnalyticsRoom(langCode); + // if there's new content to be sent, or if lastUpdated hasn't been + // set yet for this room, send the analytics events + if (summaryContent.isNotEmpty || lastUpdated == null) { + await SummaryAnalyticsEvent.sendSummaryAnalyticsEvent( + analyticsRoom, + summaryContent, + ); + } + + if (constructContent.isNotEmpty) { + await ConstructAnalyticsEvent.sendConstructsEvent( + analyticsRoom, + constructContent, + ); } - return _pangeaController.matrixState.client.allMyAnalyticsRooms; } List _studentChats = []; @@ -321,8 +350,8 @@ class MyAnalyticsController extends BaseController { List _studentSpaces = []; Future setStudentSpaces() async { - _studentSpaces = await _pangeaController - .matrixState.client.classesAndExchangesImStudyingIn; + _studentSpaces = + await _pangeaController.matrixState.client.spacesImStudyingIn; } List get studentSpaces { diff --git a/lib/pangea/controllers/pangea_controller.dart b/lib/pangea/controllers/pangea_controller.dart index 1d1a00c05..7fbf91fd0 100644 --- a/lib/pangea/controllers/pangea_controller.dart +++ b/lib/pangea/controllers/pangea_controller.dart @@ -1,3 +1,4 @@ +import 'dart:async'; import 'dart:developer'; import 'dart:math'; @@ -12,6 +13,8 @@ import 'package:fluffychat/pangea/controllers/local_settings.dart'; import 'package:fluffychat/pangea/controllers/message_data_controller.dart'; import 'package:fluffychat/pangea/controllers/my_analytics_controller.dart'; import 'package:fluffychat/pangea/controllers/permissions_controller.dart'; +import 'package:fluffychat/pangea/controllers/practice_activity_generation_controller.dart'; +import 'package:fluffychat/pangea/controllers/practice_activity_record_controller.dart'; import 'package:fluffychat/pangea/controllers/speech_to_text_controller.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/controllers/text_to_speech_controller.dart'; @@ -53,6 +56,8 @@ class PangeaController { late TextToSpeechController textToSpeech; late SpeechToTextController speechToText; late LanguageDetectionController languageDetection; + late PracticeActivityRecordController activityRecordController; + late PracticeGenerationController practiceGenerationController; ///store Services late PLocalStore pStoreService; @@ -101,6 +106,8 @@ class PangeaController { textToSpeech = TextToSpeechController(this); speechToText = SpeechToTextController(this); languageDetection = LanguageDetectionController(this); + activityRecordController = PracticeActivityRecordController(this); + practiceGenerationController = PracticeGenerationController(); PAuthGaurd.pController = this; } diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart index f83903473..363accf8e 100644 --- a/lib/pangea/controllers/permissions_controller.dart +++ b/lib/pangea/controllers/permissions_controller.dart @@ -3,7 +3,7 @@ import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/p_extension.dart'; import 'package:matrix/matrix.dart'; @@ -117,27 +117,4 @@ class PermissionsController extends BaseController { return isToolEnabled(ToolSetting.interactiveTranslator, room) && isToolEnabled(ToolSetting.interactiveGrammar, room); } - - // bool get showChatListStartChatFloatingActionButton { - // //for now, I'm turning off chat button when not in the context of a clas - // //it will still be possible to private chat outside of a class - // //need to investigate if private chats can be put in a space. i suppose they can - // //if so, do we want that? - // try { - // if (_pangeaController.classController.activeClass == null) return false; - - // // final isExchange = - // // (_pangeaController.classController.activeClass?.isExchange ?? false); - // const isExchange = false; - // final regular = (canUserPrivateChat() || canUserGroupChat()); - // final inExchange = - // (canUserPrivateChatExchanges() || canUserGroupChatExchanges()); - // final theAnswer = isExchange ? inExchange : regular; - // // debugger(when: kDebugMode && !theAnswer); - // return theAnswer; - // } catch (e, s) { - // ErrorHandler.logError(e: e, s: s); - // return false; - // } - // } } diff --git a/lib/pangea/controllers/practice_activity_generation_controller.dart b/lib/pangea/controllers/practice_activity_generation_controller.dart new file mode 100644 index 000000000..29047d0c4 --- /dev/null +++ b/lib/pangea/controllers/practice_activity_generation_controller.dart @@ -0,0 +1,102 @@ +import 'dart:async'; + +import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; +import 'package:fluffychat/pangea/enum/activity_type_enum.dart'; +import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/multiple_choice_activity_model.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart'; +import 'package:matrix/matrix.dart'; + +/// Represents an item in the completion cache. +class _RequestCacheItem { + PracticeActivityRequest req; + + Future practiceActivityEvent; + + _RequestCacheItem({ + required this.req, + required this.practiceActivityEvent, + }); +} + +/// Controller for handling activity completions. +class PracticeGenerationController { + static final Map _cache = {}; + Timer? _cacheClearTimer; + + PracticeGenerationController() { + _initializeCacheClearing(); + } + + void _initializeCacheClearing() { + const duration = Duration(minutes: 2); + _cacheClearTimer = Timer.periodic(duration, (Timer t) => _clearCache()); + } + + void _clearCache() { + _cache.clear(); + } + + void dispose() { + _cacheClearTimer?.cancel(); + } + + Future _sendAndPackageEvent( + PracticeActivityModel model, + PangeaMessageEvent pangeaMessageEvent, + ) async { + final Event? activityEvent = await pangeaMessageEvent.room.sendPangeaEvent( + content: model.toJson(), + parentEventId: pangeaMessageEvent.eventId, + type: PangeaEventTypes.pangeaActivityRes, + ); + + if (activityEvent == null) { + return null; + } + + return PracticeActivityEvent( + event: activityEvent, + timeline: pangeaMessageEvent.timeline, + ); + } + + Future getPracticeActivity( + PracticeActivityRequest req, + PangeaMessageEvent event, + ) async { + final int cacheKey = req.hashCode; + + if (_cache.containsKey(cacheKey)) { + return _cache[cacheKey]!.practiceActivityEvent; + } else { + //TODO - send request to server/bot, either via API or via event of type pangeaActivityReq + // for now, just make and send the event from the client + final Future eventFuture = + _sendAndPackageEvent(dummyModel(event), event); + + _cache[cacheKey] = + _RequestCacheItem(req: req, practiceActivityEvent: eventFuture); + + return _cache[cacheKey]!.practiceActivityEvent; + } + } + + PracticeActivityModel dummyModel(PangeaMessageEvent event) => + PracticeActivityModel( + tgtConstructs: [ + ConstructIdentifier(lemma: "be", type: ConstructType.vocab), + ], + activityType: ActivityTypeEnum.multipleChoice, + langCode: event.messageDisplayLangCode, + msgId: event.eventId, + multipleChoice: MultipleChoice( + question: "What is a synonym for 'happy'?", + choices: ["sad", "angry", "joyful", "tired"], + answer: "joyful", + ), + ); +} diff --git a/lib/pangea/controllers/practice_activity_record_controller.dart b/lib/pangea/controllers/practice_activity_record_controller.dart new file mode 100644 index 000000000..b075fa553 --- /dev/null +++ b/lib/pangea/controllers/practice_activity_record_controller.dart @@ -0,0 +1,94 @@ +import 'dart:async'; +import 'dart:developer'; + +import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:flutter/foundation.dart'; +import 'package:matrix/matrix.dart'; + +/// Represents an item in the completion cache. +class _RecordCacheItem { + PracticeActivityRecordModel data; + + Future recordEvent; + + _RecordCacheItem({required this.data, required this.recordEvent}); +} + +/// Controller for handling activity completions. +class PracticeActivityRecordController { + static final Map _cache = {}; + late final PangeaController _pangeaController; + Timer? _cacheClearTimer; + + PracticeActivityRecordController(this._pangeaController) { + _initializeCacheClearing(); + } + + void _initializeCacheClearing() { + const duration = Duration(minutes: 2); + _cacheClearTimer = Timer.periodic(duration, (Timer t) => _clearCache()); + } + + void _clearCache() { + _cache.clear(); + } + + void dispose() { + _cacheClearTimer?.cancel(); + } + + /// Sends a practice activity record to the server and returns the corresponding event. + /// + /// The [recordModel] parameter is the model representing the practice activity record. + /// The [practiceActivityEvent] parameter is the event associated with the practice activity. + /// Note that the system will send a new event if the model has changed in any way ie it is + /// a new completion of the practice activity. However, it will cache previous sends to ensure + /// that opening and closing of the widget does not result in multiple sends of the same data. + /// It allows checks the data to make sure that it contains responses to the practice activity + /// and does not represent a blank record with no actual completion to be saved. + /// + /// Returns a [Future] that completes with the corresponding [Event] object. + Future send( + PracticeActivityRecordModel recordModel, + PracticeActivityEvent practiceActivityEvent, + ) async { + final int cacheKey = recordModel.hashCode; + + if (recordModel.responses.isEmpty) { + return null; + } + + if (_cache.containsKey(cacheKey)) { + return _cache[cacheKey]!.recordEvent; + } else { + final Future eventFuture = practiceActivityEvent.event.room + .sendPangeaEvent( + content: recordModel.toJson(), + parentEventId: practiceActivityEvent.event.eventId, + type: PangeaEventTypes.activityRecord, + ) + .catchError((e) { + debugger(when: kDebugMode); + ErrorHandler.logError( + e: e, + s: StackTrace.current, + data: { + 'recordModel': recordModel.toJson(), + 'practiceActivityEvent': practiceActivityEvent.event.toJson(), + }, + ); + return null; + }); + + _cache[cacheKey] = + _RecordCacheItem(data: recordModel, recordEvent: eventFuture); + + return _cache[cacheKey]!.recordEvent; + } + } +} diff --git a/lib/pangea/controllers/space_rules_edit_controller.dart b/lib/pangea/controllers/space_rules_edit_controller.dart index a13fd9219..6142e273f 100644 --- a/lib/pangea/controllers/space_rules_edit_controller.dart +++ b/lib/pangea/controllers/space_rules_edit_controller.dart @@ -2,7 +2,7 @@ import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:matrix/matrix.dart'; import '../extensions/pangea_room_extension/pangea_room_extension.dart'; -import '../models/class_model.dart'; +import '../models/space_model.dart'; class RoomRulesEditController { final Room? room; diff --git a/lib/pangea/enum/activity_type_enum.dart b/lib/pangea/enum/activity_type_enum.dart new file mode 100644 index 000000000..d429aa038 --- /dev/null +++ b/lib/pangea/enum/activity_type_enum.dart @@ -0,0 +1,16 @@ +enum ActivityTypeEnum { multipleChoice, freeResponse, listening, speaking } + +extension ActivityTypeExtension on ActivityTypeEnum { + String get string { + switch (this) { + case ActivityTypeEnum.multipleChoice: + return 'multiple_choice'; + case ActivityTypeEnum.freeResponse: + return 'free_response'; + case ActivityTypeEnum.listening: + return 'listening'; + case ActivityTypeEnum.speaking: + return 'speaking'; + } + } +} diff --git a/lib/pangea/enum/assistance_state_enum.dart b/lib/pangea/enum/assistance_state_enum.dart new file mode 100644 index 000000000..6d3a853da --- /dev/null +++ b/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; + } + } +} diff --git a/lib/pangea/enum/message_mode_enum.dart b/lib/pangea/enum/message_mode_enum.dart index 25948d23b..58753e5b5 100644 --- a/lib/pangea/enum/message_mode_enum.dart +++ b/lib/pangea/enum/message_mode_enum.dart @@ -1,9 +1,16 @@ +import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:matrix/matrix.dart'; -enum MessageMode { translation, definition, speechToText, textToSpeech } +enum MessageMode { + translation, + definition, + speechToText, + textToSpeech, + practiceActivity +} extension MessageModeExtension on MessageMode { IconData get icon { @@ -17,6 +24,8 @@ extension MessageModeExtension on MessageMode { //TODO change icon for audio messages case MessageMode.definition: return Icons.book; + case MessageMode.practiceActivity: + return Symbols.fitness_center; default: return Icons.error; // Icon to indicate an error or unsupported mode } @@ -32,6 +41,8 @@ extension MessageModeExtension on MessageMode { return L10n.of(context)!.speechToTextTooltip; case MessageMode.definition: return L10n.of(context)!.definitions; + case MessageMode.practiceActivity: + return L10n.of(context)!.practice; default: return L10n.of(context)! .oopsSomethingWentWrong; // Title to indicate an error or unsupported mode @@ -48,6 +59,8 @@ extension MessageModeExtension on MessageMode { return L10n.of(context)!.speechToTextTooltip; case MessageMode.definition: return L10n.of(context)!.define; + case MessageMode.practiceActivity: + return L10n.of(context)!.practice; default: return L10n.of(context)! .oopsSomethingWentWrong; // Title to indicate an error or unsupported mode @@ -58,6 +71,7 @@ extension MessageModeExtension on MessageMode { switch (this) { case MessageMode.translation: case MessageMode.textToSpeech: + case MessageMode.practiceActivity: case MessageMode.definition: return event.messageType == MessageTypes.Text; case MessageMode.speechToText: @@ -66,4 +80,29 @@ extension MessageModeExtension on MessageMode { return true; } } + + Color? iconColor( + PangeaMessageEvent event, + MessageMode? currentMode, + BuildContext context, + ) { + final bool isPracticeActivity = this == MessageMode.practiceActivity; + final bool practicing = currentMode == MessageMode.practiceActivity; + final bool practiceEnabled = event.hasUncompletedActivity; + + // if this is the practice activity icon, and there's no practice activities available, + // and the current mode is not practice, return lower opacity color. + if (isPracticeActivity && !practicing && !practiceEnabled) { + return Theme.of(context).iconTheme.color?.withOpacity(0.5); + } + + // if this is not a practice activity icon, and practice activities are available, + // then return lower opacity color if the current mode is practice. + if (!isPracticeActivity && practicing && practiceEnabled) { + return Theme.of(context).iconTheme.color?.withOpacity(0.5); + } + + // if this is the current mode, return primary color. + return currentMode == this ? Theme.of(context).colorScheme.primary : null; + } } diff --git a/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart b/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart deleted file mode 100644 index af1df62a0..000000000 --- a/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart +++ /dev/null @@ -1,83 +0,0 @@ -part of "client_extension.dart"; - -extension ClassesAndExchangesClientExtension on Client { - List get _classes => rooms.where((e) => e.isPangeaClass).toList(); - - List get _classesImTeaching => rooms - .where( - (e) => - e.isPangeaClass && - e.ownPowerLevel == ClassDefaultValues.powerLevelOfAdmin, - ) - .toList(); - - Future> get _classesAndExchangesImTeaching async { - final allSpaces = rooms.where((room) => room.isSpace); - for (final Room space in allSpaces) { - if (space.getState(EventTypes.RoomPowerLevels) == null) { - await space.postLoad(); - } - } - - final spaces = rooms - .where( - (e) => - (e.isPangeaClass || e.isExchange) && - e.ownPowerLevel == ClassDefaultValues.powerLevelOfAdmin, - ) - .toList(); - return spaces; - } - - List get _classesImIn => rooms - .where( - (e) => - e.isPangeaClass && - e.ownPowerLevel < ClassDefaultValues.powerLevelOfAdmin, - ) - .toList(); - - Future> get _classesAndExchangesImStudyingIn async { - final List joinedSpaces = rooms - .where( - (room) => room.isSpace && room.membership == Membership.join, - ) - .toList(); - - for (final Room space in joinedSpaces) { - if (space.getState(EventTypes.RoomPowerLevels) == null) { - await space.postLoad(); - } - } - - final spaces = rooms - .where( - (e) => - (e.isPangeaClass || e.isExchange) && - e.ownPowerLevel < ClassDefaultValues.powerLevelOfAdmin, - ) - .toList(); - return spaces; - } - - List get _classesAndExchangesImIn => - rooms.where((e) => e.isPangeaClass || e.isExchange).toList(); - - Future get _lastUpdatedRoomRules async => - (await _classesAndExchangesImTeaching) - .where((space) => space.rulesUpdatedAt != null) - .sorted( - (a, b) => b.rulesUpdatedAt!.compareTo(a.rulesUpdatedAt!), - ) - .firstOrNull - ?.pangeaRoomRules; - - ClassSettingsModel? get _lastUpdatedClassSettings => classesImTeaching - .where((space) => space.classSettingsUpdatedAt != null) - .sorted( - (a, b) => - b.classSettingsUpdatedAt!.compareTo(a.classSettingsUpdatedAt!), - ) - .firstOrNull - ?.classSettings; -} diff --git a/lib/pangea/extensions/client_extension/client_analytics_extension.dart b/lib/pangea/extensions/client_extension/client_analytics_extension.dart index d7c97e38c..fde4d8e54 100644 --- a/lib/pangea/extensions/client_extension/client_analytics_extension.dart +++ b/lib/pangea/extensions/client_extension/client_analytics_extension.dart @@ -123,7 +123,7 @@ extension AnalyticsClientExtension on Client { // Allows teachers to join analytics rooms without being invited Future _joinAnalyticsRoomsInAllSpaces() async { final List joinFutures = []; - for (final Room space in (await _classesAndExchangesImTeaching)) { + for (final Room space in (await _spacesImTeaching)) { joinFutures.add(space.joinAnalyticsRoomsInSpace()); } await Future.wait(joinFutures); @@ -154,4 +154,17 @@ extension AnalyticsClientExtension on Client { await _joinInvitedAnalyticsRooms(); await _joinAnalyticsRoomsInAllSpaces(); } + + Future> _allAnalyticsRoomsLastUpdated() async { + // get the last updated time for each analytics room + final Map lastUpdatedMap = {}; + for (final analyticsRoom in allMyAnalyticsRooms) { + final DateTime? lastUpdated = await analyticsRoom.analyticsLastUpdated( + PangeaEventTypes.summaryAnalytics, + userID!, + ); + lastUpdatedMap[analyticsRoom.id] = lastUpdated; + } + return lastUpdatedMap; + } } diff --git a/lib/pangea/extensions/client_extension/client_extension.dart b/lib/pangea/extensions/client_extension/client_extension.dart index d23caa5de..779f8ee0a 100644 --- a/lib/pangea/extensions/client_extension/client_extension.dart +++ b/lib/pangea/extensions/client_extension/client_extension.dart @@ -3,17 +3,18 @@ import 'dart:developer'; import 'package:collection/collection.dart'; import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; +import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/constants/pangea_room_types.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:matrix/matrix.dart'; -part "classes_and_exchanges_extension.dart"; part "client_analytics_extension.dart"; part "general_info_extension.dart"; +part "space_extension.dart"; extension PangeaClient on Client { // analytics @@ -43,27 +44,20 @@ extension PangeaClient on Client { Future migrateAnalyticsRooms() async => await _migrateAnalyticsRooms(); - // classes_and_exchanges + Future> allAnalyticsRoomsLastUpdated() async => + await _allAnalyticsRoomsLastUpdated(); - List get classes => _classes; + // spaces - List get classesImTeaching => _classesImTeaching; + Future> get spacesImTeaching async => await _spacesImTeaching; - Future> get classesAndExchangesImTeaching async => - await _classesAndExchangesImTeaching; + Future> get spacesImStudyingIn async => await _spacesImStudyingIn; - List get classesImIn => _classesImIn; - - Future> get classesAndExchangesImStudyingIn async => - await _classesAndExchangesImStudyingIn; - - List get classesAndExchangesImIn => _classesAndExchangesImIn; + List get spacesImIn => _spacesImIn; Future get lastUpdatedRoomRules async => await _lastUpdatedRoomRules; - ClassSettingsModel? get lastUpdatedClassSettings => _lastUpdatedClassSettings; - // general_info Future> get teacherRoomIds async => await _teacherRoomIds; diff --git a/lib/pangea/extensions/client_extension/general_info_extension.dart b/lib/pangea/extensions/client_extension/general_info_extension.dart index 058b6f695..26b87b533 100644 --- a/lib/pangea/extensions/client_extension/general_info_extension.dart +++ b/lib/pangea/extensions/client_extension/general_info_extension.dart @@ -3,7 +3,7 @@ part of "client_extension.dart"; extension GeneralInfoClientExtension on Client { Future> get _teacherRoomIds async { final List adminRoomIds = []; - for (final Room adminSpace in (await _classesAndExchangesImTeaching)) { + for (final Room adminSpace in (await _spacesImTeaching)) { adminRoomIds.add(adminSpace.id); final List adminSpaceRooms = adminSpace.allSpaceChildRoomIds; adminRoomIds.addAll(adminSpaceRooms); @@ -13,7 +13,7 @@ extension GeneralInfoClientExtension on Client { Future> get _myTeachers async { final List teachers = []; - for (final classRoom in classesAndExchangesImIn) { + for (final classRoom in spacesImIn) { for (final teacher in await classRoom.teachers) { // If person requesting list of teachers is a teacher in another classroom, don't add them to the list if (!teachers.any((e) => e.id == teacher.id) && userID != teacher.id) { diff --git a/lib/pangea/extensions/client_extension/space_extension.dart b/lib/pangea/extensions/client_extension/space_extension.dart new file mode 100644 index 000000000..3bef46e45 --- /dev/null +++ b/lib/pangea/extensions/client_extension/space_extension.dart @@ -0,0 +1,64 @@ +part of "client_extension.dart"; + +extension SpaceClientExtension on Client { + Future> get _spacesImTeaching async { + final allSpaces = rooms.where((room) => room.isSpace); + for (final Room space in allSpaces) { + if (space.getState(EventTypes.RoomPowerLevels) == null) { + await space.postLoad(); + } + } + + final spaces = rooms + .where( + (e) => + (e.isSpace) && + e.ownPowerLevel == ClassDefaultValues.powerLevelOfAdmin, + ) + .toList(); + return spaces; + } + + Future> get _spacesImStudyingIn async { + final List joinedSpaces = rooms + .where( + (room) => room.isSpace && room.membership == Membership.join, + ) + .toList(); + + for (final Room space in joinedSpaces) { + if (space.getState(EventTypes.RoomPowerLevels) == null) { + await space.postLoad(); + } + } + + final spaces = rooms + .where( + (e) => + e.isSpace && + e.ownPowerLevel < ClassDefaultValues.powerLevelOfAdmin, + ) + .toList(); + return spaces; + } + + List get _spacesImIn => rooms.where((e) => e.isSpace).toList(); + + Future get _lastUpdatedRoomRules async => + (await _spacesImTeaching) + .where((space) => space.rulesUpdatedAt != null) + .sorted( + (a, b) => b.rulesUpdatedAt!.compareTo(a.rulesUpdatedAt!), + ) + .firstOrNull + ?.pangeaRoomRules; + + // LanguageSettingsModel? get _lastUpdatedLanguageSettings => rooms + // .where((room) => room.isSpace && room.languageSettingsUpdatedAt != null) + // .sorted( + // (a, b) => b.languageSettingsUpdatedAt! + // .compareTo(a.languageSettingsUpdatedAt!), + // ) + // .firstOrNull + // ?.languageSettings; +} diff --git a/lib/pangea/extensions/pangea_event_extension.dart b/lib/pangea/extensions/pangea_event_extension.dart index f62f27925..17e14ed86 100644 --- a/lib/pangea/extensions/pangea_event_extension.dart +++ b/lib/pangea/extensions/pangea_event_extension.dart @@ -2,6 +2,8 @@ import 'dart:developer'; import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/models/choreo_record.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; import 'package:flutter/foundation.dart'; @@ -26,7 +28,12 @@ extension PangeaEvent on Event { return PangeaRepresentation.fromJson(json) as V; case PangeaEventTypes.choreoRecord: return ChoreoRecord.fromJson(json) as V; + case PangeaEventTypes.pangeaActivityRes: + return PracticeActivityModel.fromJson(json) as V; + case PangeaEventTypes.activityRecord: + return PracticeActivityRecordModel.fromJson(json) as V; default: + debugger(when: kDebugMode); throw Exception("$type events do not have pangea content"); } } diff --git a/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart index 24dad6c41..2dc3f6f59 100644 --- a/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart @@ -60,7 +60,7 @@ extension ChildrenAndParentsRoomExtension on Room { //resolve somehow if multiple rooms have the state? //check logic Room? _firstParentWithState(String stateType) { - if (![PangeaEventTypes.classSettings, PangeaEventTypes.rules] + if (![PangeaEventTypes.languageSettings, PangeaEventTypes.rules] .contains(stateType)) { return null; } @@ -77,13 +77,6 @@ extension ChildrenAndParentsRoomExtension on Room { return null; } - /// find any parents and return the rooms - List get _immediateClassParents => pangeaSpaceParents - .where( - (element) => element.isPangeaClass, - ) - .toList(); - List get _pangeaSpaceParents => client.rooms .where( (r) => r.isSpace, @@ -98,16 +91,16 @@ extension ChildrenAndParentsRoomExtension on Room { String _nameIncludingParents(BuildContext context) { String nameSoFar = getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)); Room currentRoom = this; - if (currentRoom.immediateClassParents.isEmpty) { + if (currentRoom.pangeaSpaceParents.isEmpty) { return nameSoFar; } - currentRoom = currentRoom.immediateClassParents.first; + currentRoom = currentRoom.pangeaSpaceParents.first; var nameToAdd = currentRoom.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)); nameToAdd = nameToAdd.length <= 10 ? nameToAdd : "${nameToAdd.substring(0, 10)}..."; nameSoFar = '$nameToAdd > $nameSoFar'; - if (currentRoom.immediateClassParents.isEmpty) { + if (currentRoom.pangeaSpaceParents.isEmpty) { return nameSoFar; } return "... > $nameSoFar"; @@ -130,11 +123,19 @@ extension ChildrenAndParentsRoomExtension on Room { // Checks if has permissions to add child chat // Or whether potential child space is ancestor of this - bool _canAddAsParentOf(Room? child) { - if (child == null || !child.isSpace) { - return _canIAddSpaceChild(child); - } - if (id == child.id) return false; - return !child._allSpaceChildRoomIds.contains(id); + bool _canAddAsParentOf(Room? child, {bool spaceMode = false}) { + // don't add a room to itself + if (id == child?.id) return false; + spaceMode = child?.isSpace ?? spaceMode; + + // get the bool for adding chats to spaces + final bool canAddChild = _canIAddSpaceChild(child, spaceMode: spaceMode); + if (!spaceMode) return canAddChild; + + // if adding space to a space, check if the child is an ancestor + // to prevent cycles + final bool isCycle = + child != null ? child._allSpaceChildRoomIds.contains(id) : false; + return canAddChild && !isCycle; } } diff --git a/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart index 570cbebba..b8dae7ab3 100644 --- a/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart @@ -4,15 +4,18 @@ 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/model_keys.dart'; import 'package:fluffychat/pangea/constants/pangea_room_types.dart'; +import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/models/analytics/analytics_event.dart'; import 'package:fluffychat/pangea/models/analytics/constructs_event.dart'; import 'package:fluffychat/pangea/models/analytics/summary_analytics_event.dart'; import 'package:fluffychat/pangea/models/analytics/summary_analytics_model.dart'; import 'package:fluffychat/pangea/models/bot_options_model.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/language_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; @@ -36,11 +39,11 @@ import '../../models/representation_content_model.dart'; import '../client_extension/client_extension.dart'; part "children_and_parents_extension.dart"; -part "class_and_exchange_settings_extension.dart"; part "events_extension.dart"; part "room_analytics_extension.dart"; part "room_information_extension.dart"; part "room_settings_extension.dart"; +part "space_settings_extension.dart"; part "user_permissions_extension.dart"; extension PangeaRoom on Room { @@ -49,9 +52,6 @@ extension PangeaRoom on Room { Future joinAnalyticsRoomsInSpace() async => await _joinAnalyticsRoomsInSpace(); - Future ensureAnalyticsRoomExists() async => - await _ensureAnalyticsRoomExists(); - Future addAnalyticsRoomToSpace(Room analyticsRoom) async => await _addAnalyticsRoomToSpace(analyticsRoom); @@ -105,8 +105,6 @@ extension PangeaRoom on Room { Room? firstParentWithState(String stateType) => _firstParentWithState(stateType); - List get immediateClassParents => _immediateClassParents; - List get pangeaSpaceParents => _pangeaSpaceParents; String nameIncludingParents(BuildContext context) => @@ -114,7 +112,9 @@ extension PangeaRoom on Room { List get allSpaceChildRoomIds => _allSpaceChildRoomIds; - bool canAddAsParentOf(Room? child) => _canAddAsParentOf(child); + bool canAddAsParentOf(Room? child, {bool spaceMode = false}) { + return _canAddAsParentOf(child, spaceMode: spaceMode); + } // class_and_exchange_settings @@ -130,15 +130,10 @@ extension PangeaRoom on Room { Future setClassPowerLevels() async => await _setClassPowerLevels(); - DateTime? get classSettingsUpdatedAt => _classSettingsUpdatedAt; - - ClassSettingsModel? get classSettings => _classSettings; - - Event? get languageSettingsStateEvent => _languageSettingsStateEvent; - Event? get pangeaRoomRulesStateEvent => _pangeaRoomRulesStateEvent; - ClassSettingsModel? get firstLanguageSettings => _firstLanguageSettings; + Future> targetLanguages() async => + await _targetLanguages(); // events @@ -222,8 +217,6 @@ extension PangeaRoom on Room { bool isFirstOrSecondChild(String roomId) => _isFirstOrSecondChild(roomId); - bool get isExchange => _isExchange; - bool get isDirectChatWithoutMe => _isDirectChatWithoutMe; // bool isMadeForLang(String langCode) => _isMadeForLang(langCode); @@ -234,8 +227,6 @@ extension PangeaRoom on Room { bool get isLocked => _isLocked; - bool get isPangeaClass => _isPangeaClass; - bool isAnalyticsRoomOfUser(String userId) => _isAnalyticsRoomOfUser(userId); bool get isAnalyticsRoom => _isAnalyticsRoom; @@ -283,7 +274,9 @@ extension PangeaRoom on Room { bool get canDelete => _canDelete; - bool canIAddSpaceChild(Room? room) => _canIAddSpaceChild(room); + bool canIAddSpaceChild(Room? room, {bool spaceMode = false}) { + return _canIAddSpaceChild(room, spaceMode: spaceMode); + } bool get canIAddSpaceParents => _canIAddSpaceParents; diff --git a/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart b/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart index 756f83adf..e3d00f8a8 100644 --- a/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart @@ -55,14 +55,6 @@ extension AnalyticsRoomExtension on Room { } } - // check if analytics room exists for a given language code - // and if not, create it - Future _ensureAnalyticsRoomExists() async { - await postLoad(); - if (firstLanguageSettings?.targetLanguage == null) return; - await client.getMyAnalyticsRoom(firstLanguageSettings!.targetLanguage); - } - // add 1 analytics room to 1 space Future _addAnalyticsRoomToSpace(Room analyticsRoom) async { if (!isSpace) { @@ -107,7 +99,7 @@ extension AnalyticsRoomExtension on Room { return; } - for (final Room space in (await client.classesAndExchangesImStudyingIn)) { + for (final Room space in (await client.spacesImStudyingIn)) { if (space.spaceChildren.any((sc) => sc.roomId == id)) continue; await space.addAnalyticsRoomToSpace(this); } @@ -183,7 +175,7 @@ extension AnalyticsRoomExtension on Room { return; } - for (final Room space in (await client.classesAndExchangesImStudyingIn)) { + for (final Room space in (await client.spacesImStudyingIn)) { await space.inviteSpaceTeachersToAnalyticsRoom(this); } } diff --git a/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart b/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart index a6c5af180..857ac26e0 100644 --- a/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart @@ -40,11 +40,6 @@ extension RoomInformationRoomExtension on Room { )); } - bool get _isExchange => - isSpace && - languageSettingsStateEvent == null && - pangeaRoomRulesStateEvent != null; - bool get _isDirectChatWithoutMe => isDirectChat && !getParticipants().any((e) => e.id == client.userID); @@ -83,8 +78,6 @@ extension RoomInformationRoomExtension on Room { ClassDefaultValues.powerLevelOfAdmin; } - bool get _isPangeaClass => isSpace && languageSettingsStateEvent != null; - bool _isAnalyticsRoomOfUser(String userId) => isAnalyticsRoom && isMadeByUser(userId); diff --git a/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart b/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart index 0abeab942..399382f1c 100644 --- a/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart @@ -40,8 +40,7 @@ extension RoomSettingsRoomExtension on Room { IconData? get _roomTypeIcon { if (membership == Membership.invite) return Icons.add; - if (isPangeaClass) return Icons.school; - if (isExchange) return Icons.connecting_airports; + if (isSpace) return Icons.school; if (isAnalyticsRoom) return Icons.analytics; if (isDirectChat) return Icons.forum; return Icons.group; diff --git a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart b/lib/pangea/extensions/pangea_room_extension/space_settings_extension.dart similarity index 54% rename from lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart rename to lib/pangea/extensions/pangea_room_extension/space_settings_extension.dart index 44423d90f..5799631b1 100644 --- a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/space_settings_extension.dart @@ -1,6 +1,6 @@ part of "pangea_room_extension.dart"; -extension ClassAndExchangeSettingsRoomExtension on Room { +extension SpaceRoomExtension on Room { DateTime? get _rulesUpdatedAt { if (!isSpace) return null; return pangeaRoomRulesStateEvent?.originServerTs ?? creationTime; @@ -9,7 +9,7 @@ extension ClassAndExchangeSettingsRoomExtension on Room { String get _classCode { if (!isSpace) { for (final Room potentialClassRoom in pangeaSpaceParents) { - if (potentialClassRoom.isPangeaClass) { + if (potentialClassRoom.isSpace) { return potentialClassRoom.classCode; } } @@ -84,46 +84,6 @@ extension ClassAndExchangeSettingsRoomExtension on Room { } } - DateTime? get _classSettingsUpdatedAt { - if (!isSpace) return null; - return languageSettingsStateEvent?.originServerTs ?? creationTime; - } - - /// the pangeaClass event is listed an importantStateEvent so, if event exists, - /// it's already local. If it's an old class and doesn't, then the class_controller - /// should automatically migrate during this same session, when the space is first loaded - ClassSettingsModel? get _classSettings { - try { - if (!isSpace) { - return null; - } - final Map? content = languageSettingsStateEvent?.content; - if (content != null) { - final ClassSettingsModel classSettings = - ClassSettingsModel.fromJson(content); - return classSettings; - } - return null; - } catch (err, s) { - Sentry.addBreadcrumb( - Breadcrumb( - message: "Error in classSettings", - data: {"room": toJson()}, - ), - ); - ErrorHandler.logError(e: err, s: s); - return null; - } - } - - Event? get _languageSettingsStateEvent { - final dynamic classSettings = getState(PangeaEventTypes.classSettings); - if (classSettings is Event) { - return classSettings; - } - return null; - } - Event? get _pangeaRoomRulesStateEvent { final dynamic roomRules = getState(PangeaEventTypes.rules); if (roomRules is Event) { @@ -132,7 +92,76 @@ extension ClassAndExchangeSettingsRoomExtension on Room { return null; } - ClassSettingsModel? get _firstLanguageSettings => - classSettings ?? - firstParentWithState(PangeaEventTypes.classSettings)?.classSettings; + Future> _targetLanguages() async { + await requestParticipants(); + final students = _students; + + final Map langCounts = {}; + final List allRooms = client.rooms; + for (final User student in students) { + for (final Room room in allRooms) { + if (!room.isAnalyticsRoomOfUser(student.id)) continue; + final String? langCode = room.madeForLang; + if (langCode == null || + langCode.isEmpty || + langCode == LanguageKeys.unknownLanguage) { + continue; + } + final LanguageModel lang = PangeaLanguage.byLangCode(langCode); + langCounts[lang] ??= 0; + langCounts[lang] = langCounts[lang]! + 1; + } + } + // get a list of language models, sorted + // by the number of students who are learning that language + return langCounts.entries.map((entry) => entry.key).toList() + ..sort( + (a, b) => langCounts[b]!.compareTo(langCounts[a]!), + ); + } + + // DateTime? get _languageSettingsUpdatedAt { + // if (!isSpace) return null; + // return languageSettingsStateEvent?.originServerTs ?? creationTime; + // } + + /// the pangeaClass event is listed an importantStateEvent so, if event exists, + /// it's already local. If it's an old class and doesn't, then the class_controller + /// should automatically migrate during this same session, when the space is first loaded + // LanguageSettingsModel? get _languageSettings { + // try { + // if (!isSpace) { + // return null; + // } + // final Map? content = languageSettingsStateEvent?.content; + // if (content != null) { + // final LanguageSettingsModel languageSettings = + // LanguageSettingsModel.fromJson(content); + // return languageSettings; + // } + // return null; + // } catch (err, s) { + // Sentry.addBreadcrumb( + // Breadcrumb( + // message: "Error in languageSettings", + // data: {"room": toJson()}, + // ), + // ); + // ErrorHandler.logError(e: err, s: s); + // return null; + // } + // } + + // Event? get _languageSettingsStateEvent { + // final dynamic languageSettings = + // getState(PangeaEventTypes.languageSettings); + // if (languageSettings is Event) { + // return languageSettings; + // } + // return null; + // } + + // LanguageSettingsModel? get _firstLanguageSettings => + // languageSettings ?? + // firstParentWithState(PangeaEventTypes.languageSettings)?.languageSettings; } diff --git a/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart b/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart index eef684f0d..b94db5c57 100644 --- a/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart @@ -78,39 +78,30 @@ extension UserPermissionsRoomExtension on Room { bool get _canDelete => isSpaceAdmin; - bool _canIAddSpaceChild(Room? room) { + bool _canIAddSpaceChild(Room? room, {bool spaceMode = false}) { if (!isSpace) { ErrorHandler.logError( - m: "should not call canIAddSpaceChildren on non-space room", + m: "should not call canIAddSpaceChildren on non-space room. Room id: $id", data: toJson(), s: StackTrace.current, ); return false; } - if (room != null && !room._isRoomAdmin) { - return false; - } - if (!pangeaCanSendEvent(EventTypes.SpaceChild) && !_isRoomAdmin) { - return false; - } - if (room == null) { - return isRoomAdmin || (pangeaRoomRules?.isCreateRooms ?? false); - } - if (room.isExchange) { - return isRoomAdmin; - } - if (!room.isSpace) { - return pangeaRoomRules?.isCreateRooms ?? false; - } - if (room.isPangeaClass) { - ErrorHandler.logError( - m: "should not call canIAddSpaceChild with class", - data: room.toJson(), - s: StackTrace.current, - ); - return false; - } - return false; + + final isSpaceAdmin = isRoomAdmin; + final isChildRoomAdmin = room?.isRoomAdmin ?? true; + + // if user is not admin of child room, return false + if (!isChildRoomAdmin) return false; + + // if the child room is a space, or will be a space, + // then the user must be an admin of the parent space + if (room?.isSpace ?? spaceMode) return isSpaceAdmin; + + // otherwise, the user can add the child room to the parent + // if they're the admin of the parent or if the parent creation + // of group chats + return isSpaceAdmin || (pangeaRoomRules?.isCreateRooms ?? false); } bool get _canIAddSpaceParents => diff --git a/lib/pangea/matrix_event_wrappers/pangea_audio_events.dart b/lib/pangea/matrix_event_wrappers/pangea_audio_events.dart deleted file mode 100644 index 3583d021e..000000000 --- a/lib/pangea/matrix_event_wrappers/pangea_audio_events.dart +++ /dev/null @@ -1,9 +0,0 @@ -// relates to a pangea representation event -// the matrix even fits the form of a regular matrix audio event -// but with something to distinguish it as a pangea audio event - -import 'package:matrix/matrix.dart'; - -class PangeaAudioEvent { - Event? _event; -} diff --git a/lib/pangea/matrix_event_wrappers/pangea_choreo_event.dart b/lib/pangea/matrix_event_wrappers/pangea_choreo_event.dart index 47a6b688f..a6a79fd4f 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_choreo_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_choreo_event.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; @@ -23,7 +25,7 @@ class ChoreoEvent { _content ??= event.getPangeaContent(); return _content; } catch (err, s) { - if (kDebugMode) rethrow; + debugger(when: kDebugMode); ErrorHandler.logError(e: err, s: s); return null; } diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart index ff8696989..951b77dfc 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'dart:developer'; import 'package:collection/collection.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; @@ -6,14 +7,16 @@ import 'package:fluffychat/pangea/controllers/text_to_speech_controller.dart'; import 'package:fluffychat/pangea/enum/audio_encoding_enum.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_representation_event.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; import 'package:fluffychat/pangea/models/choreo_record.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/pangea_match_model.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/models/speech_to_text_models.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/widgets/chat/message_audio_card.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -549,12 +552,42 @@ class PangeaMessageEvent { _event.messageType != PangeaEventTypes.report && _event.messageType == MessageTypes.Text; + // this is just showActivityIcon now but will include + // logic for showing + bool get showMessageButtons => hasUncompletedActivity; + + /// Returns a boolean value indicating whether to show an activity icon for this message event. + /// + /// The [hasUncompletedActivity] getter checks if the [l2Code] is null, and if so, returns false. + /// Otherwise, it retrieves a list of [PracticeActivityEvent] objects using the [practiceActivities] function + /// with the [l2Code] as an argument. + /// If the list is empty, it returns false. + /// Otherwise, it checks if every activity in the list is complete using the [isComplete] property. + /// If any activity is not complete, it returns true, indicating that the activity icon should be shown. + /// Otherwise, it returns false. + bool get hasUncompletedActivity { + if (l2Code == null) return false; + final List activities = practiceActivities(l2Code!); + if (activities.isEmpty) return false; + + // for now, only show the button if the event has no completed activities + // TODO - revert this after adding logic to show next activity + for (final activity in activities) { + if (activity.isComplete) return false; + } + return true; + // if (activities.isEmpty) return false; + // return !activities.every((activity) => activity.isComplete); + } + + String? get l2Code => + MatrixState.pangeaController.languageController.activeL2Code(); + String get messageDisplayLangCode { final bool immersionMode = MatrixState .pangeaController.permissionsController .isToolEnabled(ToolSetting.immersionMode, room); - final String? l2Code = MatrixState.pangeaController.languageController - .activeL2Code(roomID: room.id); + final String? originalLangCode = (originalWritten ?? originalSent)?.langCode; @@ -578,6 +611,53 @@ class PangeaMessageEvent { return steps; } + List get _practiceActivityEvents => _latestEdit + .aggregatedEvents( + timeline, + PangeaEventTypes.pangeaActivityRes, + ) + .map( + (e) => PracticeActivityEvent( + timeline: timeline, + event: e, + ), + ) + .toList(); + + bool get hasActivities { + try { + final String? l2code = + MatrixState.pangeaController.languageController.activeL2Code(); + + if (l2code == null) return false; + + return practiceActivities(l2code).isNotEmpty; + } catch (e, s) { + ErrorHandler.logError(e: e, s: s); + return false; + } + } + + List practiceActivities( + String langCode, { + bool debug = false, + }) { + try { + debugger(when: debug); + final List activities = []; + for (final event in _practiceActivityEvents) { + if (event.practiceActivity.langCode == langCode) { + activities.add(event); + } + } + return activities; + } catch (e, s) { + debugger(when: kDebugMode); + ErrorHandler.logError(e: e, s: s, data: event.toJson()); + return []; + } + } + // List get activities => //each match is turned into an activity that other students can access //they're not told the answer but have to find it themselves diff --git a/lib/pangea/matrix_event_wrappers/pangea_tokens_event.dart b/lib/pangea/matrix_event_wrappers/pangea_tokens_event.dart index 0c138c637..f617b8dae 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_tokens_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_tokens_event.dart @@ -1,6 +1,9 @@ +import 'dart:developer'; + import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:flutter/foundation.dart'; import 'package:matrix/matrix.dart'; import '../constants/pangea_event_types.dart'; @@ -22,6 +25,7 @@ class TokensEvent { _content ??= event.getPangeaContent(); return _content!; } catch (err, s) { + debugger(when: kDebugMode); ErrorHandler.logError(e: err, s: s); return null; } diff --git a/lib/pangea/matrix_event_wrappers/practice_acitivity_record_event.dart b/lib/pangea/matrix_event_wrappers/practice_acitivity_record_event.dart new file mode 100644 index 000000000..d4b9cde23 --- /dev/null +++ b/lib/pangea/matrix_event_wrappers/practice_acitivity_record_event.dart @@ -0,0 +1,24 @@ +import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart'; +import 'package:matrix/matrix.dart'; + +import '../constants/pangea_event_types.dart'; + +class PracticeActivityRecordEvent { + Event event; + + PracticeActivityRecordModel? _content; + + PracticeActivityRecordEvent({required this.event}) { + if (event.type != PangeaEventTypes.activityRecord) { + throw Exception( + "${event.type} should not be used to make a PracticeActivityRecordEvent", + ); + } + } + + PracticeActivityRecordModel? get record { + _content ??= event.getPangeaContent(); + return _content!; + } +} diff --git a/lib/pangea/matrix_event_wrappers/practice_activity_event.dart b/lib/pangea/matrix_event_wrappers/practice_activity_event.dart new file mode 100644 index 000000000..c5f35be91 --- /dev/null +++ b/lib/pangea/matrix_event_wrappers/practice_activity_event.dart @@ -0,0 +1,67 @@ +import 'dart:developer'; + +import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_acitivity_record_event.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart'; +import 'package:flutter/foundation.dart'; +import 'package:matrix/matrix.dart'; + +import '../constants/pangea_event_types.dart'; + +class PracticeActivityEvent { + Event event; + Timeline? timeline; + PracticeActivityModel? _content; + + PracticeActivityEvent({ + required this.event, + required this.timeline, + content, + }) { + if (content != null) { + if (!kDebugMode) { + throw Exception( + "content should not be set on product, just a dev placeholder", + ); + } else { + _content = content; + } + } + if (event.type != PangeaEventTypes.pangeaActivityRes) { + throw Exception( + "${event.type} should not be used to make a PracticeActivityEvent", + ); + } + } + + PracticeActivityModel get practiceActivity { + _content ??= event.getPangeaContent(); + return _content!; + } + + //in aggregatedEvents for the event, find all practiceActivityRecordEvents whose sender matches the client's userId + List get allRecords { + if (timeline == null) { + debugger(when: kDebugMode); + return []; + } + final List records = event + .aggregatedEvents(timeline!, PangeaEventTypes.activityRecord) + .toList(); + + return records + .map((event) => PracticeActivityRecordEvent(event: event)) + .toList(); + } + + List get userRecords => allRecords + .where( + (recordEvent) => + recordEvent.event.senderId == recordEvent.event.room.client.userID, + ) + .toList(); + + /// Checks if there are any user records in the list for this activity, + /// and, if so, then the activity is complete + bool get isComplete => userRecords.isNotEmpty; +} diff --git a/lib/pangea/models/custom_input_translation_model.dart b/lib/pangea/models/custom_input_translation_model.dart index 37d6c7a88..ff0c339dc 100644 --- a/lib/pangea/models/custom_input_translation_model.dart +++ b/lib/pangea/models/custom_input_translation_model.dart @@ -8,7 +8,6 @@ class CustomInputRequestModel { String targetLangCode; String userId; String roomId; - String? classId; String? goldTranslation; List? goldContinuances; @@ -20,7 +19,6 @@ class CustomInputRequestModel { required this.targetLangCode, required this.userId, required this.roomId, - required this.classId, required this.goldTranslation, required this.goldContinuances, }); @@ -32,7 +30,6 @@ class CustomInputRequestModel { targetLangCode: json[ModelKey.tgtLang], userId: json['user_id'], roomId: json['room_id'], - classId: json['class_id'], goldTranslation: json['gold_translation'], goldContinuances: json['gold_continuances'] != null ? List.from(json['gold_continuances']) @@ -48,7 +45,6 @@ class CustomInputRequestModel { ModelKey.tgtLang: targetLangCode, 'user_id': userId, 'room_id': roomId, - 'class_id': classId, 'gold_translation': goldTranslation, 'gold_continuances': goldContinuances != null ? List.from(goldContinuances!.map((e) => e.toJson())) diff --git a/lib/pangea/models/exchange_model.dart b/lib/pangea/models/exchange_model.dart deleted file mode 100644 index 42ce2a175..000000000 --- a/lib/pangea/models/exchange_model.dart +++ /dev/null @@ -1,40 +0,0 @@ -import 'dart:developer'; - -import 'package:flutter/foundation.dart'; - -import 'package:fluffychat/pangea/constants/model_keys.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'class_model.dart'; - -class ExchangeModel { - PangeaRoomRules permissions; - - ExchangeModel({ - required this.permissions, - }); - - factory ExchangeModel.fromJson(Map json) { - return ExchangeModel( - permissions: PangeaRoomRules.fromJson(json[ModelKey.permissions]), - ); - } - - Map toJson() { - final data = {}; - try { - data[ModelKey.permissions] = permissions.toJson(); - return data; - } catch (e, s) { - debugger(when: kDebugMode); - ErrorHandler.logError(e: e, s: s); - return data; - } - } - - updateEditableClassField(String key, dynamic value) { - switch (key) { - default: - throw Exception('Invalid key for setting permissions - $key'); - } - } -} diff --git a/lib/pangea/models/language_model.dart b/lib/pangea/models/language_model.dart index 2505d1d2c..ae960b212 100644 --- a/lib/pangea/models/language_model.dart +++ b/lib/pangea/models/language_model.dart @@ -79,8 +79,8 @@ class LanguageModel { static LanguageModel multiLingual([BuildContext? context]) => LanguageModel( displayName: context != null - ? L10n.of(context)!.multiLingualClass - : "Multilingual Class", + ? L10n.of(context)!.multiLingualSpace + : "Multilingual Space", l2: false, l1: false, langCode: LanguageKeys.multiLanguage, diff --git a/lib/pangea/models/practice_activities.dart/multiple_choice_activity_model.dart b/lib/pangea/models/practice_activities.dart/multiple_choice_activity_model.dart new file mode 100644 index 000000000..3cd78a66a --- /dev/null +++ b/lib/pangea/models/practice_activities.dart/multiple_choice_activity_model.dart @@ -0,0 +1,41 @@ +import 'package:fluffychat/config/app_config.dart'; +import 'package:flutter/material.dart'; + +class MultipleChoice { + final String question; + final List choices; + final String answer; + + MultipleChoice({ + required this.question, + required this.choices, + required this.answer, + }); + + bool isCorrect(int index) => index == correctAnswerIndex; + + bool get isValidQuestion => choices.contains(answer); + + int get correctAnswerIndex => choices.indexOf(answer); + + int choiceIndex(String choice) => choices.indexOf(choice); + + Color choiceColor(int index) => + index == correctAnswerIndex ? AppConfig.success : AppConfig.warning; + + factory MultipleChoice.fromJson(Map json) { + return MultipleChoice( + question: json['question'] as String, + choices: (json['choices'] as List).map((e) => e as String).toList(), + answer: json['answer'] as String, + ); + } + + Map toJson() { + return { + 'question': question, + 'choices': choices, + 'answer': answer, + }; + } +} diff --git a/lib/pangea/models/practice_activities.dart/practice_activity_model.dart b/lib/pangea/models/practice_activities.dart/practice_activity_model.dart new file mode 100644 index 000000000..ae8455c7f --- /dev/null +++ b/lib/pangea/models/practice_activities.dart/practice_activity_model.dart @@ -0,0 +1,280 @@ +import 'dart:developer'; + +import 'package:fluffychat/pangea/enum/activity_type_enum.dart'; +import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/multiple_choice_activity_model.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:flutter/foundation.dart'; + +class ConstructIdentifier { + final String lemma; + final ConstructType type; + + ConstructIdentifier({required this.lemma, required this.type}); + + factory ConstructIdentifier.fromJson(Map json) { + try { + return ConstructIdentifier( + lemma: json['lemma'] as String, + type: ConstructType.values.firstWhere( + (e) => e.string == json['type'], + ), + ); + } catch (e, s) { + debugger(when: kDebugMode); + ErrorHandler.logError(e: e, s: s, data: json); + rethrow; + } + } + + Map toJson() { + return { + 'lemma': lemma, + 'type': type.string, + }; + } +} + +class CandidateMessage { + final String msgId; + final String roomId; + final String text; + + CandidateMessage({ + required this.msgId, + required this.roomId, + required this.text, + }); + + factory CandidateMessage.fromJson(Map json) { + return CandidateMessage( + msgId: json['msg_id'] as String, + roomId: json['room_id'] as String, + text: json['text'] as String, + ); + } + + Map toJson() { + return { + 'msg_id': msgId, + 'room_id': roomId, + 'text': text, + }; + } +} + +enum PracticeActivityMode { focus, srs } + +extension on PracticeActivityMode { + String get value { + switch (this) { + case PracticeActivityMode.focus: + return 'focus'; + case PracticeActivityMode.srs: + return 'srs'; + } + } +} + +class PracticeActivityRequest { + final PracticeActivityMode? mode; + final List? targetConstructs; + final List? candidateMessages; + final List? userIds; + final ActivityTypeEnum? activityType; + final int? numActivities; + + PracticeActivityRequest({ + this.mode, + this.targetConstructs, + this.candidateMessages, + this.userIds, + this.activityType, + this.numActivities, + }); + + factory PracticeActivityRequest.fromJson(Map json) { + return PracticeActivityRequest( + mode: PracticeActivityMode.values.firstWhere( + (e) => e.value == json['mode'], + ), + targetConstructs: (json['target_constructs'] as List?) + ?.map((e) => ConstructIdentifier.fromJson(e as Map)) + .toList(), + candidateMessages: (json['candidate_msgs'] as List) + .map((e) => CandidateMessage.fromJson(e as Map)) + .toList(), + userIds: (json['user_ids'] as List?)?.map((e) => e as String).toList(), + activityType: ActivityTypeEnum.values.firstWhere( + (e) => e.toString().split('.').last == json['activity_type'], + ), + numActivities: json['num_activities'] as int, + ); + } + + Map toJson() { + return { + 'mode': mode?.value, + 'target_constructs': targetConstructs?.map((e) => e.toJson()).toList(), + 'candidate_msgs': candidateMessages?.map((e) => e.toJson()).toList(), + 'user_ids': userIds, + 'activity_type': activityType?.toString().split('.').last, + 'num_activities': numActivities, + }; + } + + // override operator == and hashCode + @override + bool operator ==(Object other) { + if (identical(this, other)) return true; + + return other is PracticeActivityRequest && + other.mode == mode && + other.targetConstructs == targetConstructs && + other.candidateMessages == candidateMessages && + other.userIds == userIds && + other.activityType == activityType && + other.numActivities == numActivities; + } + + @override + int get hashCode { + return mode.hashCode ^ + targetConstructs.hashCode ^ + candidateMessages.hashCode ^ + userIds.hashCode ^ + activityType.hashCode ^ + numActivities.hashCode; + } +} + +class FreeResponse { + final String question; + final String correctAnswer; + final String gradingGuide; + + FreeResponse({ + required this.question, + required this.correctAnswer, + required this.gradingGuide, + }); + + factory FreeResponse.fromJson(Map json) { + return FreeResponse( + question: json['question'] as String, + correctAnswer: json['correct_answer'] as String, + gradingGuide: json['grading_guide'] as String, + ); + } + + Map toJson() { + return { + 'question': question, + 'correct_answer': correctAnswer, + 'grading_guide': gradingGuide, + }; + } +} + +class Listening { + final String audioUrl; + final String text; + + Listening({required this.audioUrl, required this.text}); + + factory Listening.fromJson(Map json) { + return Listening( + audioUrl: json['audio_url'] as String, + text: json['text'] as String, + ); + } + + Map toJson() { + return { + 'audio_url': audioUrl, + 'text': text, + }; + } +} + +class Speaking { + final String text; + + Speaking({required this.text}); + + factory Speaking.fromJson(Map json) { + return Speaking( + text: json['text'] as String, + ); + } + + Map toJson() { + return { + 'text': text, + }; + } +} + +class PracticeActivityModel { + final List tgtConstructs; + final String langCode; + final String msgId; + final ActivityTypeEnum activityType; + final MultipleChoice? multipleChoice; + final Listening? listening; + final Speaking? speaking; + final FreeResponse? freeResponse; + + PracticeActivityModel({ + required this.tgtConstructs, + required this.langCode, + required this.msgId, + required this.activityType, + this.multipleChoice, + this.listening, + this.speaking, + this.freeResponse, + }); + + factory PracticeActivityModel.fromJson(Map json) { + return PracticeActivityModel( + tgtConstructs: (json['tgt_constructs'] as List) + .map((e) => ConstructIdentifier.fromJson(e as Map)) + .toList(), + langCode: json['lang_code'] as String, + msgId: json['msg_id'] as String, + activityType: ActivityTypeEnum.values.firstWhere( + (e) => e.string == json['activity_type'], + ), + multipleChoice: json['multiple_choice'] != null + ? MultipleChoice.fromJson( + json['multiple_choice'] as Map, + ) + : null, + listening: json['listening'] != null + ? Listening.fromJson(json['listening'] as Map) + : null, + speaking: json['speaking'] != null + ? Speaking.fromJson(json['speaking'] as Map) + : null, + freeResponse: json['free_response'] != null + ? FreeResponse.fromJson( + json['free_response'] as Map, + ) + : null, + ); + } + + Map toJson() { + return { + 'tgt_constructs': tgtConstructs.map((e) => e.toJson()).toList(), + 'lang_code': langCode, + 'msg_id': msgId, + 'activity_type': activityType.toString().split('.').last, + 'multiple_choice': multipleChoice?.toJson(), + 'listening': listening?.toJson(), + 'speaking': speaking?.toJson(), + 'free_response': freeResponse?.toJson(), + }; + } +} diff --git a/lib/pangea/models/practice_activities.dart/practice_activity_record_model.dart b/lib/pangea/models/practice_activities.dart/practice_activity_record_model.dart new file mode 100644 index 000000000..3fe3e859d --- /dev/null +++ b/lib/pangea/models/practice_activities.dart/practice_activity_record_model.dart @@ -0,0 +1,137 @@ +// record the options that the user selected +// note that this is not the same as the correct answer +// the user might have selected multiple options before +// finding the answer +import 'dart:developer'; +import 'dart:typed_data'; + +class PracticeActivityRecordModel { + final String? question; + late List responses; + + PracticeActivityRecordModel({ + required this.question, + List? responses, + }) { + if (responses == null) { + this.responses = List.empty(growable: true); + } else { + this.responses = responses; + } + } + + factory PracticeActivityRecordModel.fromJson( + Map json, + ) { + return PracticeActivityRecordModel( + question: json['question'] as String, + responses: (json['responses'] as List) + .map((e) => ActivityResponse.fromJson(e as Map)) + .toList(), + ); + } + + Map toJson() { + return { + 'question': question, + 'responses': responses.map((e) => e.toJson()).toList(), + }; + } + + /// get the latest response index according to the response timeStamp + /// sort the responses by timestamp and get the index of the last response + String? get latestResponse { + if (responses.isEmpty) { + return null; + } + responses.sort((a, b) => a.timestamp.compareTo(b.timestamp)); + return responses[responses.length - 1].text; + } + + void addResponse({ + String? text, + Uint8List? audioBytes, + Uint8List? imageBytes, + }) { + try { + responses.add( + ActivityResponse( + text: text, + audioBytes: audioBytes, + imageBytes: imageBytes, + timestamp: DateTime.now(), + ), + ); + } catch (e) { + debugger(); + } + } + + @override + bool operator ==(Object other) { + if (identical(this, other)) return true; + + return other is PracticeActivityRecordModel && + other.question == question && + other.responses.length == responses.length && + List.generate( + responses.length, + (index) => responses[index] == other.responses[index], + ).every((element) => element); + } + + @override + int get hashCode => question.hashCode ^ responses.hashCode; +} + +class ActivityResponse { + // the user's response + // has nullable string, nullable audio bytes, nullable image bytes, and timestamp + final String? text; + final Uint8List? audioBytes; + final Uint8List? imageBytes; + final DateTime timestamp; + + ActivityResponse({ + this.text, + this.audioBytes, + this.imageBytes, + required this.timestamp, + }); + + factory ActivityResponse.fromJson(Map json) { + return ActivityResponse( + text: json['text'] as String?, + audioBytes: json['audio'] as Uint8List?, + imageBytes: json['image'] as Uint8List?, + timestamp: DateTime.parse(json['timestamp'] as String), + ); + } + + Map toJson() { + return { + 'text': text, + 'audio': audioBytes, + 'image': imageBytes, + 'timestamp': timestamp.toIso8601String(), + }; + } + + @override + bool operator ==(Object other) { + if (identical(this, other)) return true; + + return other is ActivityResponse && + other.text == text && + other.audioBytes == audioBytes && + other.imageBytes == imageBytes && + other.timestamp == timestamp; + } + + @override + int get hashCode => + text.hashCode ^ + audioBytes.hashCode ^ + imageBytes.hashCode ^ + timestamp.hashCode; +} diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/space_model.dart similarity index 88% rename from lib/pangea/models/class_model.dart rename to lib/pangea/models/space_model.dart index 7e95c9d26..f17507fa8 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/space_model.dart @@ -1,6 +1,5 @@ import 'dart:developer'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -12,7 +11,7 @@ import '../constants/language_keys.dart'; import '../constants/pangea_event_types.dart'; import 'language_model.dart'; -class ClassSettingsModel { +class LanguageSettingsModel { String? city; String? country; String? schoolName; @@ -20,7 +19,7 @@ class ClassSettingsModel { String dominantLanguage; String targetLanguage; - ClassSettingsModel({ + LanguageSettingsModel({ this.dominantLanguage = ClassDefaultValues.defaultDominantLanguage, this.targetLanguage = ClassDefaultValues.defaultTargetLanguage, this.languageLevel, @@ -29,17 +28,8 @@ class ClassSettingsModel { this.schoolName, }); - static ClassSettingsModel get newClass => ClassSettingsModel( - city: null, - country: null, - dominantLanguage: ClassDefaultValues.defaultDominantLanguage, - languageLevel: null, - schoolName: null, - targetLanguage: ClassDefaultValues.defaultTargetLanguage, - ); - - factory ClassSettingsModel.fromJson(Map json) { - return ClassSettingsModel( + factory LanguageSettingsModel.fromJson(Map json) { + return LanguageSettingsModel( city: json['city'], country: json['country'], dominantLanguage: LanguageModel.codeFromNameOrCode( @@ -72,35 +62,9 @@ class ClassSettingsModel { } } - //TODO: define enum with all possible values - updateEditableClassField(String key, dynamic value) { - switch (key) { - case ModelKey.clientClassCity: - city = value; - break; - case ModelKey.clientClassCountry: - country = value; - break; - case ModelKey.clientClassDominantLanguage: - dominantLanguage = value; - break; - case ModelKey.clientClassTargetLanguage: - targetLanguage = value; - break; - case ModelKey.clientLanguageLevel: - languageLevel = value; - break; - case ModelKey.clientSchool: - schoolName = value; - break; - default: - throw Exception('Invalid key for setting permissions - $key'); - } - } - StateEvent get toStateEvent => StateEvent( content: toJson(), - type: PangeaEventTypes.classSettings, + type: PangeaEventTypes.languageSettings, ); } diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index a6ae5730f..f8e929a13 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -4,7 +4,7 @@ import 'package:country_picker/country_picker.dart'; import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/utils/instructions.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/pangea/pages/analytics/analytics_language_button.dart b/lib/pangea/pages/analytics/analytics_language_button.dart new file mode 100644 index 000000000..d74e07be1 --- /dev/null +++ b/lib/pangea/pages/analytics/analytics_language_button.dart @@ -0,0 +1,38 @@ +import 'package:fluffychat/pangea/models/language_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +class AnalyticsLanguageButton extends StatelessWidget { + final List languages; + final LanguageModel value; + final void Function(LanguageModel) onChange; + const AnalyticsLanguageButton({ + super.key, + required this.value, + required this.onChange, + required this.languages, + }); + + @override + Widget build(BuildContext context) { + return PopupMenuButton( + icon: const Icon(Icons.language_outlined), + tooltip: L10n.of(context)!.changeAnalyticsLanguage, + initialValue: value, + onSelected: (LanguageModel? lang) { + if (lang == null) { + debugPrint("when is lang null?"); + return; + } + onChange(lang); + }, + itemBuilder: (BuildContext context) => + languages.map((LanguageModel lang) { + return PopupMenuItem( + value: lang, + child: Text(lang.getDisplayName(context) ?? lang.langCode), + ); + }).toList(), + ); + } +} diff --git a/lib/pangea/pages/analytics/analytics_list_tile.dart b/lib/pangea/pages/analytics/analytics_list_tile.dart index 53bd72922..8b1e1ba49 100644 --- a/lib/pangea/pages/analytics/analytics_list_tile.dart +++ b/lib/pangea/pages/analytics/analytics_list_tile.dart @@ -26,8 +26,6 @@ class AnalyticsListTile extends StatefulWidget { required this.onTap, required this.pangeaController, this.controller, - // this.isEnabled = true, - // this.showSpaceAnalytics = true, this.refreshStream, }); @@ -40,8 +38,6 @@ class AnalyticsListTile extends StatefulWidget { final bool allowNavigateOnSelect; final bool isSelected; - // final bool isEnabled; - // final bool showSpaceAnalytics; final PangeaController pangeaController; final BaseAnalyticsController? controller; @@ -64,6 +60,14 @@ class AnalyticsListTileState extends State { }); } + @override + void didUpdateWidget(covariant AnalyticsListTile oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.selected != widget.selected) { + setTileData(); + } + } + @override void dispose() { refreshSubscription?.cancel(); @@ -87,73 +91,68 @@ class AnalyticsListTileState extends State { color: widget.isSelected ? Theme.of(context).colorScheme.secondaryContainer : Colors.transparent, - child: Tooltip( - message: widget.selected.type == AnalyticsEntryType.room - ? L10n.of(context)!.joinToView - : L10n.of(context)!.studentAnalyticsNotAvailable, - child: ListTile( - leading: widget.selected.type == AnalyticsEntryType.privateChats - ? CircleAvatar( - backgroundColor: Theme.of(context).primaryColor, - foregroundColor: Colors.white, - radius: Avatar.defaultSize / 2, - child: const Icon(Icons.forum), - ) - : Avatar( - mxContent: widget.avatar, - name: widget.selected.displayName, - littleIcon: room?.roomTypeIcon, - ), - title: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - widget.selected.displayName, - maxLines: 1, - overflow: TextOverflow.ellipsis, - softWrap: false, - style: TextStyle( - fontWeight: FontWeight.bold, - color: Theme.of(context).textTheme.bodyLarge!.color, - ), + child: ListTile( + leading: widget.selected.type == AnalyticsEntryType.privateChats + ? CircleAvatar( + backgroundColor: Theme.of(context).primaryColor, + foregroundColor: Colors.white, + radius: Avatar.defaultSize / 2, + child: const Icon(Icons.forum), + ) + : Avatar( + mxContent: widget.avatar, + name: widget.selected.displayName, + littleIcon: room?.roomTypeIcon, + ), + title: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Text( + widget.selected.displayName, + maxLines: 1, + overflow: TextOverflow.ellipsis, + softWrap: false, + style: TextStyle( + fontWeight: FontWeight.bold, + color: Theme.of(context).textTheme.bodyLarge!.color, ), ), - Tooltip( - message: L10n.of(context)!.timeOfLastMessage, - child: Text( - tileData?.lastMessageTime?.localizedTimeShort(context) ?? "", - style: TextStyle( - fontSize: 13, - color: Theme.of(context).textTheme.bodyMedium!.color, - ), + ), + Tooltip( + message: L10n.of(context)!.timeOfLastMessage, + child: Text( + tileData?.lastMessageTime?.localizedTimeShort(context) ?? "", + style: TextStyle( + fontSize: 13, + color: Theme.of(context).textTheme.bodyMedium!.color, ), ), - ], - ), - subtitle: ListSummaryAnalytics( - chartAnalytics: tileData, - ), - selected: widget.isSelected, - onTap: () { - if (widget.controller?.widget.selectedView == null) { - widget.onTap(widget.selected); - return; - } - if ((room?.isSpace ?? false) && widget.allowNavigateOnSelect) { - final String selectedView = - widget.controller!.widget.selectedView!.route; - context.go('/rooms/analytics/${room!.id}/$selectedView'); - return; - } - widget.onTap(widget.selected); - }, - trailing: (room?.isSpace ?? false) && - widget.selected.type != AnalyticsEntryType.privateChats && - widget.allowNavigateOnSelect - ? const Icon(Icons.chevron_right) - : null, + ), + ], ), + subtitle: ListSummaryAnalytics( + chartAnalytics: tileData, + ), + selected: widget.isSelected, + onTap: () { + if (widget.controller?.widget.selectedView == null) { + widget.onTap(widget.selected); + return; + } + if ((room?.isSpace ?? false) && widget.allowNavigateOnSelect) { + final String selectedView = + widget.controller!.widget.selectedView!.route; + context.go('/rooms/analytics/${room!.id}/$selectedView'); + return; + } + widget.onTap(widget.selected); + }, + trailing: (room?.isSpace ?? false) && + widget.selected.type != AnalyticsEntryType.privateChats && + widget.allowNavigateOnSelect + ? const Icon(Icons.chevron_right) + : null, ), ); } diff --git a/lib/pangea/pages/analytics/base_analytics.dart b/lib/pangea/pages/analytics/base_analytics.dart index 2b548226b..3ab8fa0f2 100644 --- a/lib/pangea/pages/analytics/base_analytics.dart +++ b/lib/pangea/pages/analytics/base_analytics.dart @@ -4,6 +4,7 @@ import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/analytics/analytics_event.dart'; +import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/pages/analytics/base_analytics_view.dart'; import 'package:fluffychat/pangea/pages/analytics/student_analytics/student_analytics.dart'; import 'package:flutter/material.dart'; @@ -24,8 +25,9 @@ class BaseAnalyticsPage extends StatefulWidget { final AnalyticsSelected defaultSelected; final AnalyticsSelected? alwaysSelected; final StudentAnalyticsController? myAnalyticsController; + final List targetLanguages; - const BaseAnalyticsPage({ + BaseAnalyticsPage({ super.key, required this.pageTitle, required this.tabs, @@ -33,7 +35,10 @@ class BaseAnalyticsPage extends StatefulWidget { required this.defaultSelected, this.selectedView, this.myAnalyticsController, - }); + targetLanguages, + }) : targetLanguages = (targetLanguages?.isNotEmpty ?? false) + ? targetLanguages + : MatrixState.pangeaController.pLanguageStore.targetOptions; @override State createState() => BaseAnalyticsController(); @@ -157,6 +162,12 @@ class BaseAnalyticsController extends State { refreshStream.add(false); } + Future toggleSpaceLang(LanguageModel lang) async { + await pangeaController.analytics.setCurrentAnalyticsSpaceLang(lang); + await setChartData(); + refreshStream.add(false); + } + void setCurrentLemma(String? lemma) { currentLemma = lemma; setState(() {}); diff --git a/lib/pangea/pages/analytics/base_analytics_view.dart b/lib/pangea/pages/analytics/base_analytics_view.dart index 09805ef71..8cab95396 100644 --- a/lib/pangea/pages/analytics/base_analytics_view.dart +++ b/lib/pangea/pages/analytics/base_analytics_view.dart @@ -3,6 +3,7 @@ import 'dart:math'; import 'package:fluffychat/pangea/enum/bar_chart_view_enum.dart'; import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; import 'package:fluffychat/pangea/enum/time_span.dart'; +import 'package:fluffychat/pangea/pages/analytics/analytics_language_button.dart'; import 'package:fluffychat/pangea/pages/analytics/analytics_list_tile.dart'; import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart'; import 'package:fluffychat/pangea/pages/analytics/construct_list.dart'; @@ -121,6 +122,14 @@ class BaseAnalyticsView extends StatelessWidget { onChange: (TimeSpan value) => controller.toggleTimeSpan(context, value), ), + if (controller.widget.defaultSelected.type == + AnalyticsEntryType.space) + AnalyticsLanguageButton( + value: controller.pangeaController.analytics + .currentAnalyticsSpaceLang, + onChange: (lang) => controller.toggleSpaceLang(lang), + languages: controller.widget.targetLanguages, + ), ], ), Expanded( diff --git a/lib/pangea/pages/analytics/class_list/class_list.dart b/lib/pangea/pages/analytics/class_list/class_list.dart deleted file mode 100644 index 45aa6bb88..000000000 --- a/lib/pangea/pages/analytics/class_list/class_list.dart +++ /dev/null @@ -1,79 +0,0 @@ -import 'dart:async'; - -import 'package:fluffychat/pangea/enum/time_span.dart'; -import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart'; -import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart'; -import 'package:fluffychat/pangea/pages/analytics/class_list/class_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; - -import '../../../../widgets/matrix.dart'; -import '../../../controllers/pangea_controller.dart'; -import '../../../models/analytics/chart_analytics_model.dart'; -import '../../../utils/sync_status_util_v2.dart'; -import '../../../widgets/common/list_placeholder.dart'; - -class AnalyticsClassList extends StatefulWidget { - const AnalyticsClassList({super.key}); - - @override - State createState() => AnalyticsClassListController(); -} - -class AnalyticsClassListController extends State { - PangeaController pangeaController = MatrixState.pangeaController; - List models = []; - List spaces = []; - - @override - void initState() { - super.initState(); - Matrix.of(context).client.classesAndExchangesImTeaching.then((spaceList) { - spaceList = spaceList - .where( - (space) => !spaceList.any( - (parentSpace) => parentSpace.spaceChildren - .any((child) => child.roomId == space.id), - ), - ) - .toList(); - spaces = spaceList; - setState(() {}); - }); - } - - @override - Widget build(BuildContext context) { - return PLoadingStatusV2( - shimmerChild: const ListPlaceholder(), - child: AnalyticsClassListView(this), - onFinish: () { - // getAllClassAnalytics(context); - }, - ); - } - - Future updateClassAnalytics( - Room? space, - ) async { - if (space == null) { - return null; - } - - final data = await pangeaController.analytics.getAnalytics( - defaultSelected: AnalyticsSelected( - space.id, - AnalyticsEntryType.space, - space.name, - ), - forceUpdate: true, - ); - setState(() {}); - return data; - } - - void toggleTimeSpan(BuildContext context, TimeSpan timeSpan) { - pangeaController.analytics.setCurrentAnalyticsTimeSpan(timeSpan); - setState(() {}); - } -} diff --git a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart b/lib/pangea/pages/analytics/space_analytics/space_analytics.dart similarity index 63% rename from lib/pangea/pages/analytics/class_analytics/class_analytics.dart rename to lib/pangea/pages/analytics/space_analytics/space_analytics.dart index 9bf5ac7a3..b32780761 100644 --- a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart +++ b/lib/pangea/pages/analytics/space_analytics/space_analytics.dart @@ -4,6 +4,7 @@ import 'dart:developer'; import 'package:fluffychat/pangea/constants/pangea_room_types.dart'; import 'package:fluffychat/pangea/enum/bar_chart_view_enum.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/common/list_placeholder.dart'; import 'package:fluffychat/pangea/widgets/common/p_circular_loader.dart'; @@ -14,75 +15,74 @@ import 'package:matrix/matrix.dart'; import '../../../../widgets/matrix.dart'; import '../../../utils/sync_status_util_v2.dart'; -import 'class_analytics_view.dart'; +import 'space_analytics_view.dart'; -enum AnalyticsPageType { classList, student, classDetails } - -class ClassAnalyticsPage extends StatefulWidget { +class SpaceAnalyticsPage extends StatefulWidget { final BarChartViewSelection? selectedView; - const ClassAnalyticsPage({super.key, this.selectedView}); + const SpaceAnalyticsPage({super.key, this.selectedView}); @override - State createState() => ClassAnalyticsV2Controller(); + State createState() => SpaceAnalyticsV2Controller(); } -class ClassAnalyticsV2Controller extends State { +class SpaceAnalyticsV2Controller extends State { bool _initialized = false; // StreamSubscription? stateSub; // Timer? refreshTimer; List chats = []; List students = []; - String? get classId => GoRouterState.of(context).pathParameters['classid']; - Room? _classRoom; - - Room? get classRoom { - if (_classRoom == null || _classRoom!.id != classId) { - debugPrint("updating _classRoom"); - _classRoom = classId != null - ? Matrix.of(context).client.getRoomById(classId!) - : null; - if (_classRoom == null) { - context.go('/rooms/analytics'); - } - getChatAndStudents(); - } - return _classRoom; - } + String? get spaceId => GoRouterState.of(context).pathParameters['spaceid']; + Room? _spaceRoom; + List targetLanguages = []; @override void initState() { super.initState(); - debugPrint("init class analytics"); Future.delayed(Duration.zero, () async { - if (classRoom == null || (!(classRoom?.isSpace ?? false))) { + if (spaceRoom == null || (!(spaceRoom?.isSpace ?? false))) { context.go('/rooms'); } getChatAndStudents(); }); } + Room? get spaceRoom { + if (_spaceRoom == null || _spaceRoom!.id != spaceId) { + debugPrint("updating _spaceRoom"); + _spaceRoom = spaceId != null + ? Matrix.of(context).client.getRoomById(spaceId!) + : null; + if (_spaceRoom == null) { + context.go('/rooms/analytics'); + return null; + } + getChatAndStudents().then((_) => setTargetLanguages()); + } + return _spaceRoom; + } + Future getChatAndStudents() async { try { - await classRoom?.postLoad(); - await classRoom?.requestParticipants(); + await spaceRoom?.postLoad(); + await spaceRoom?.requestParticipants(); - if (classRoom != null) { + if (spaceRoom != null) { final response = await Matrix.of(context).client.getSpaceHierarchy( - classRoom!.id, + spaceRoom!.id, ); // set the latest fetched full hierarchy in message analytics controller // we want to avoid calling this endpoint again and again, so whenever the // data is made available, set it in the controller MatrixState.pangeaController.analytics - .setLatestHierarchy(_classRoom!.id, response); + .setLatestHierarchy(_spaceRoom!.id, response); - students = classRoom!.students; + students = spaceRoom!.students; chats = response.rooms .where( (room) => - room.roomId != classRoom!.id && + room.roomId != spaceRoom!.id && room.roomType != PangeaRoomTypes.analytics, ) .toList(); @@ -98,12 +98,12 @@ class ClassAnalyticsV2Controller extends State { } } - // @override - // void dispose() { - // super.dispose(); - // refreshTimer?.cancel(); - // stateSub?.cancel(); - // } + Future setTargetLanguages() async { + // get a list of language models, sorted by the + // number of students who are learning that language + targetLanguages = await spaceRoom?.targetLanguages() ?? []; + setState(() {}); + } @override Widget build(BuildContext context) { @@ -116,7 +116,7 @@ class ClassAnalyticsV2Controller extends State { // onFinish: () { // getChatAndStudentAnalytics(context); // }, - child: ClassAnalyticsView(this), + child: SpaceAnalyticsView(this), ); } } diff --git a/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart b/lib/pangea/pages/analytics/space_analytics/space_analytics_view.dart similarity index 72% rename from lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart rename to lib/pangea/pages/analytics/space_analytics/space_analytics_view.dart index 5f609437b..c72ec3c26 100644 --- a/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart +++ b/lib/pangea/pages/analytics/space_analytics/space_analytics_view.dart @@ -3,17 +3,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../base_analytics.dart'; -import 'class_analytics.dart'; +import 'space_analytics.dart'; -class ClassAnalyticsView extends StatelessWidget { - final ClassAnalyticsV2Controller controller; - const ClassAnalyticsView(this.controller, {super.key}); +class SpaceAnalyticsView extends StatelessWidget { + final SpaceAnalyticsV2Controller controller; + const SpaceAnalyticsView(this.controller, {super.key}); @override Widget build(BuildContext context) { - // final String pageTitle = - // "${L10n.of(context)!.classAnalytics}: ${controller.className(context)}"; - final String pageTitle = L10n.of(context)!.classAnalytics; + final String pageTitle = L10n.of(context)!.spaceAnalytics; final TabData tab1 = TabData( type: AnalyticsEntryType.room, icon: Icons.chat_bubble_outline, @@ -46,21 +44,22 @@ class ClassAnalyticsView extends StatelessWidget { .toList(), ); - return controller.classId != null + return controller.spaceId != null ? BaseAnalyticsPage( selectedView: controller.widget.selectedView, pageTitle: pageTitle, tabs: [tab1, tab2], alwaysSelected: AnalyticsSelected( - controller.classId!, + controller.spaceId!, AnalyticsEntryType.space, - controller.classRoom?.name ?? "", + controller.spaceRoom?.name ?? "", ), defaultSelected: AnalyticsSelected( - controller.classId!, + controller.spaceId!, AnalyticsEntryType.space, - controller.classRoom?.name ?? "", + controller.spaceRoom?.name ?? "", ), + targetLanguages: controller.targetLanguages, ) : const SizedBox(); } diff --git a/lib/pangea/pages/analytics/space_list/space_list.dart b/lib/pangea/pages/analytics/space_list/space_list.dart new file mode 100644 index 000000000..e325e1e94 --- /dev/null +++ b/lib/pangea/pages/analytics/space_list/space_list.dart @@ -0,0 +1,89 @@ +import 'dart:async'; + +import 'package:fluffychat/pangea/enum/time_span.dart'; +import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/models/language_model.dart'; +import 'package:fluffychat/pangea/pages/analytics/space_list/space_list_view.dart'; +import 'package:flutter/material.dart'; +import 'package:matrix/matrix.dart'; + +import '../../../../widgets/matrix.dart'; +import '../../../controllers/pangea_controller.dart'; +import '../../../utils/sync_status_util_v2.dart'; +import '../../../widgets/common/list_placeholder.dart'; + +class AnalyticsSpaceList extends StatefulWidget { + const AnalyticsSpaceList({super.key}); + + @override + State createState() => AnalyticsSpaceListController(); +} + +class AnalyticsSpaceListController extends State { + PangeaController pangeaController = MatrixState.pangeaController; + List spaces = []; + List targetLanguages = []; + + @override + void initState() { + super.initState(); + + setSpaceList().then((_) => setTargetLanguages()); + } + + StreamController refreshStream = StreamController.broadcast(); + + Future setSpaceList() async { + final spaceList = await Matrix.of(context).client.spacesImTeaching; + spaces = spaceList + .where( + (space) => !spaceList.any( + (parentSpace) => parentSpace.spaceChildren + .any((child) => child.roomId == space.id), + ), + ) + .toList(); + setState(() {}); + } + + Future setTargetLanguages() async { + if (spaces.isEmpty) return; + final Map langCounts = {}; + for (final Room space in spaces) { + final List targetLangs = await space.targetLanguages(); + for (final LanguageModel lang in targetLangs) { + langCounts[lang] ??= 0; + langCounts[lang] = langCounts[lang]! + 1; + } + } + targetLanguages = langCounts.entries.map((entry) => entry.key).toList() + ..sort( + (a, b) => langCounts[b]!.compareTo(langCounts[a]!), + ); + setState(() {}); + } + + void toggleTimeSpan(BuildContext context, TimeSpan timeSpan) { + pangeaController.analytics.setCurrentAnalyticsTimeSpan(timeSpan); + refreshStream.add(false); + setState(() {}); + } + + Future toggleSpaceLang(LanguageModel lang) async { + await pangeaController.analytics.setCurrentAnalyticsSpaceLang(lang); + refreshStream.add(false); + setState(() {}); + } + + @override + Widget build(BuildContext context) { + return PLoadingStatusV2( + shimmerChild: const ListPlaceholder(), + child: AnalyticsSpaceListView(this), + onFinish: () { + // getAllClassAnalytics(context); + }, + ); + } +} diff --git a/lib/pangea/pages/analytics/class_list/class_list_view.dart b/lib/pangea/pages/analytics/space_list/space_list_view.dart similarity index 68% rename from lib/pangea/pages/analytics/class_list/class_list_view.dart rename to lib/pangea/pages/analytics/space_list/space_list_view.dart index fe63d7675..1837d35f2 100644 --- a/lib/pangea/pages/analytics/class_list/class_list_view.dart +++ b/lib/pangea/pages/analytics/space_list/space_list_view.dart @@ -1,3 +1,4 @@ +import 'package:fluffychat/pangea/pages/analytics/analytics_language_button.dart'; import 'package:fluffychat/pangea/pages/analytics/analytics_list_tile.dart'; import 'package:fluffychat/pangea/pages/analytics/time_span_menu_button.dart'; import 'package:flutter/material.dart'; @@ -6,11 +7,11 @@ import 'package:go_router/go_router.dart'; import '../../../enum/time_span.dart'; import '../base_analytics.dart'; -import 'class_list.dart'; +import 'space_list.dart'; -class AnalyticsClassListView extends StatelessWidget { - final AnalyticsClassListController controller; - const AnalyticsClassListView(this.controller, {super.key}); +class AnalyticsSpaceListView extends StatelessWidget { + final AnalyticsSpaceListController controller; + const AnalyticsSpaceListView(this.controller, {super.key}); @override Widget build(BuildContext context) { @@ -18,7 +19,7 @@ class AnalyticsClassListView extends StatelessWidget { appBar: AppBar( centerTitle: true, title: Text( - L10n.of(context)!.classAnalytics, + L10n.of(context)!.spaceAnalytics, style: TextStyle( color: Theme.of(context).textTheme.bodyLarge!.color, fontSize: 18, @@ -35,8 +36,18 @@ class AnalyticsClassListView extends StatelessWidget { TimeSpanMenuButton( value: controller.pangeaController.analytics.currentAnalyticsTimeSpan, - onChange: (TimeSpan value) => - controller.toggleTimeSpan(context, value), + onChange: (TimeSpan value) => controller.toggleTimeSpan( + context, + value, + ), + ), + AnalyticsLanguageButton( + value: + controller.pangeaController.analytics.currentAnalyticsSpaceLang, + onChange: (lang) => controller.toggleSpaceLang(lang), + languages: controller.targetLanguages.isEmpty + ? controller.pangeaController.pLanguageStore.targetOptions + : controller.targetLanguages, ), ], ), @@ -49,7 +60,7 @@ class AnalyticsClassListView extends StatelessWidget { defaultSelected: AnalyticsSelected( controller.spaces[i].id, AnalyticsEntryType.space, - "", + controller.spaces[i].name, ), avatar: controller.spaces[i].avatar, selected: AnalyticsSelected( @@ -65,6 +76,7 @@ class AnalyticsClassListView extends StatelessWidget { allowNavigateOnSelect: true, isSelected: false, pangeaController: controller.pangeaController, + refreshStream: controller.refreshStream, ), ), ), diff --git a/lib/pangea/pages/analytics/time_span_menu_button.dart b/lib/pangea/pages/analytics/time_span_menu_button.dart index 97a2ede4b..23d2ad0c8 100644 --- a/lib/pangea/pages/analytics/time_span_menu_button.dart +++ b/lib/pangea/pages/analytics/time_span_menu_button.dart @@ -15,7 +15,6 @@ class TimeSpanMenuButton extends StatelessWidget { @override Widget build(BuildContext context) { return PopupMenuButton( - offset: const Offset(0, 100), icon: const Icon(Icons.calendar_month_outlined), tooltip: L10n.of(context)!.changeDateRange, initialValue: value, diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart deleted file mode 100644 index 1ac293494..000000000 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart +++ /dev/null @@ -1,35 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; - -class ClassAnalyticsButton extends StatelessWidget { - const ClassAnalyticsButton({super.key}); - - @override - Widget build(BuildContext context) { - final roomId = GoRouterState.of(context).pathParameters['roomid']; - final iconColor = Theme.of(context).textTheme.bodyLarge!.color; - - return Column( - children: [ - ListTile( - title: Text( - L10n.of(context)!.classAnalytics, - style: TextStyle( - color: Theme.of(context).colorScheme.secondary, - fontWeight: FontWeight.bold, - ), - ), - subtitle: Text(L10n.of(context)!.classAnalyticsDesc), - leading: CircleAvatar( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - foregroundColor: iconColor, - child: const Icon(Icons.analytics_outlined), - ), - onTap: () => context.go('/rooms/analytics/$roomId'), - ), - ], - ); - } -} diff --git a/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart b/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart index ebef184fc..c6b011315 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/pangea/pages/exchange/add_exchange_to_class.dart b/lib/pangea/pages/exchange/add_exchange_to_class.dart deleted file mode 100644 index 25b448214..000000000 --- a/lib/pangea/pages/exchange/add_exchange_to_class.dart +++ /dev/null @@ -1,59 +0,0 @@ -import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; -import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; - -class AddExchangeToClass extends StatefulWidget { - const AddExchangeToClass({super.key}); - - @override - AddExchangeToClassState createState() => AddExchangeToClassState(); -} - -class AddExchangeToClassState extends State { - final GlobalKey addToSpaceKey = GlobalKey(); - - @override - Widget build(BuildContext context) { - final String? spaceId = - GoRouterState.of(context).pathParameters['exchangeid']; - if (spaceId == null) { - return const SizedBox(); - } - - return Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text(L10n.of(context)!.addToClassTitle), - ), - body: FutureBuilder( - future: - Matrix.of(context).client.waitForRoomInSync(spaceId, join: true), - builder: (context, snapshot) { - if (snapshot.hasData) { - return ListView( - children: [ - const SizedBox(height: 40), - AddToSpaceToggles( - roomId: - GoRouterState.of(context).pathParameters['exchangeid'], - key: addToSpaceKey, - startOpen: true, - mode: AddToClassMode.exchange, - ), - ], - ); - } else { - return const Center(child: CircularProgressIndicator()); - } - }, - ), - floatingActionButton: FloatingActionButton( - onPressed: () => context.go("/rooms"), - child: const Icon(Icons.arrow_forward_outlined), - ), - ); - } -} diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index b9ec704c6..ca337222a 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -1,5 +1,5 @@ import 'package:fluffychat/pangea/constants/local.key.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/user_settings/country_picker_tile.dart'; diff --git a/lib/pangea/repo/class_analytics_repo.dart b/lib/pangea/repo/class_analytics_repo.dart deleted file mode 100644 index fae8fe3b5..000000000 --- a/lib/pangea/repo/class_analytics_repo.dart +++ /dev/null @@ -1,76 +0,0 @@ -// import 'dart:convert'; -// import 'dart:developer'; - -// import 'package:fluffychat/pangea/network/requests.dart'; -// import 'package:fluffychat/pangea/utils/analytics_util.dart'; -// import 'package:flutter/foundation.dart'; -// import 'package:http/http.dart'; - -// import '../../config/environment.dart'; -// import '../models/analytics_model_oldest.dart'; -// import '../network/urls.dart'; - -class PClassAnalyticsRepo { - /// deprecated in favor of new analytics - static Future repoGetAnalyticsByIds( - String accessToken, - String timeSpan, { - List? classIds, - List? userIds, - List? chatIds, - }) async { - // if (!AnalyticsUtil.isValidSpan(timeSpan)) throw "Invalid span"; - - // final Requests req = Requests( - // accessToken: accessToken, choreoApiKey: Environment.choreoApiKey); - - // final body = {}; - // body["timespan"] = timeSpan; - // if (classIds != null) body["class_ids"] = classIds; - // if (chatIds != null) body["chat_ids"] = chatIds; - // if (userIds != null) body["user_ids"] = userIds; - - // final Response res = - // await req.post(url: PApiUrls.classAnalytics, body: body); - // final json = jsonDecode(res.body); - - // final Iterable? classJson = json["class_analytics"]; - // final Iterable? chatJson = json["chat_analytics"]; - // final Iterable? userJson = json["user_analytics"]; - - // final classInfo = classJson != null - // ? (classJson) - // .map((e) { - // e["timespan"] = timeSpan; - // return chartAnalytics(e); - // }) - // .toList() - // .cast() - // : []; - // final chatInfo = chatJson != null - // ? (chatJson) - // .map((e) { - // e["timespan"] = timeSpan; - // return chartAnalytics(e); - // }) - // .toList() - // .cast() - // : []; - // final userInfo = userJson != null - // ? (userJson) - // .map((e) { - // e["timespan"] = timeSpan; - // return chartAnalytics(e); - // }) - // .toList() - // .cast() - // : []; - - // final List allAnalytics = [ - // ...classInfo, - // ...chatInfo, - // ...userInfo - // ]; - // return allAnalytics; - } -} diff --git a/lib/pangea/repo/exchange_repo.dart b/lib/pangea/repo/exchange_repo.dart deleted file mode 100644 index a4b78112c..000000000 --- a/lib/pangea/repo/exchange_repo.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'package:flutter/material.dart'; - -class PExchangeRepo { - static fetchExchangeClassInfo(String exchangePangeaId) async {} - - static saveExchangeRecord( - String requestFromClass, - String requestToClass, - String requestTeacher, - String requestToClassAuthor, - String exchangePangeaId, - ) async {} - - static exchangeRejectRequest(String roomId, String teacherName) async {} - - static validateExchange({ - required String requestFromClass, - required String requestToClass, - required BuildContext context, - }) async {} - - static createExchangeRequest({ - required String roomId, - required String teacherID, - required String toClass, - required BuildContext context, - }) async {} - - static isExchange( - BuildContext context, - String accessToken, - String exchangeId, - ) async {} -} diff --git a/lib/pangea/utils/any_state_holder.dart b/lib/pangea/utils/any_state_holder.dart index bd09c7131..9705a9ca1 100644 --- a/lib/pangea/utils/any_state_holder.dart +++ b/lib/pangea/utils/any_state_holder.dart @@ -4,7 +4,7 @@ import 'package:sentry_flutter/sentry_flutter.dart'; class PangeaAnyState { final Map _layerLinkAndKeys = {}; - OverlayEntry? overlay; + List entries = []; dispose() { closeOverlay(); @@ -32,26 +32,32 @@ class PangeaAnyState { _layerLinkAndKeys.remove(transformTargetId); } - void openOverlay(OverlayEntry entry, BuildContext context) { - closeOverlay(); - overlay = entry; - Overlay.of(context).insert(overlay!); + void openOverlay( + OverlayEntry entry, + BuildContext context, { + bool closePrevOverlay = true, + }) { + if (closePrevOverlay) { + closeOverlay(); + } + entries.add(entry); + Overlay.of(context).insert(entry); } void closeOverlay() { - if (overlay != null) { + if (entries.isNotEmpty) { try { - overlay?.remove(); + entries.last.remove(); } catch (err, s) { ErrorHandler.logError( e: err, s: s, data: { - "overlay": overlay, + "overlay": entries.last, }, ); } - overlay = null; + entries.removeLast(); } } diff --git a/lib/pangea/utils/chat_list_handle_space_tap.dart b/lib/pangea/utils/chat_list_handle_space_tap.dart index 4930f7ecc..9b950e15b 100644 --- a/lib/pangea/utils/chat_list_handle_space_tap.dart +++ b/lib/pangea/utils/chat_list_handle_space_tap.dart @@ -56,7 +56,7 @@ void chatListHandleSpaceTap( title: L10n.of(context)!.youreInvited, message: space.isSpace ? L10n.of(context)! - .invitedToClassOrExchange(space.name, space.creatorId ?? "???") + .invitedToSpace(space.name, space.creatorId ?? "???") : L10n.of(context)! .invitedToChat(space.name, space.creatorId ?? "???"), okLabel: L10n.of(context)!.accept, diff --git a/lib/pangea/utils/download_chat.dart b/lib/pangea/utils/download_chat.dart index a73cfa129..ab0fee8a2 100644 --- a/lib/pangea/utils/download_chat.dart +++ b/lib/pangea/utils/download_chat.dart @@ -1,10 +1,11 @@ import 'dart:async'; import 'dart:io'; +import 'package:csv/csv.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; - -import 'package:csv/csv.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:intl/intl.dart'; import 'package:matrix/matrix.dart'; @@ -15,16 +16,12 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:syncfusion_flutter_xlsio/xlsio.dart'; import 'package:universal_html/html.dart' as webFile; -import 'package:fluffychat/pangea/models/class_model.dart'; -import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../models/choreo_record.dart'; enum DownloadType { txt, csv, xlsx } Future downloadChat( Room room, - ClassSettingsModel classSettings, DownloadType type, Client client, BuildContext context, @@ -43,7 +40,6 @@ Future downloadChat( allEvents, timeline, room, - classSettings.targetLanguage, ); } catch (err) { ErrorHandler.logError( @@ -123,7 +119,6 @@ List getPangeaMessageEvents( List events, Timeline timeline, Room room, - String? targetLang, ) { final List allPangeaMessages = events .where( diff --git a/lib/pangea/utils/firebase_analytics.dart b/lib/pangea/utils/firebase_analytics.dart index 374242d7b..59485d35b 100644 --- a/lib/pangea/utils/firebase_analytics.dart +++ b/lib/pangea/utils/firebase_analytics.dart @@ -68,13 +68,6 @@ class GoogleAnalytics { ); } - static createExchange(String exchangeName, String classCode) { - logEvent( - 'create_exchange', - parameters: {'name': exchangeName, 'group_id': classCode}, - ); - } - static createChat(String newChatRoomId) { logEvent('create_chat', parameters: {"chat_id": newChatRoomId}); } @@ -93,27 +86,6 @@ class GoogleAnalytics { ); } - static addChatToExchange(String chatRoomId, String classCode) { - logEvent( - 'add_chat_to_exchange', - parameters: {"chat_id": chatRoomId, 'group_id': classCode}, - ); - } - - static inviteClassToExchange(String classId, String exchangeId) { - logEvent( - 'invite_class_to_exchange', - parameters: {'group_id': classId, 'exchange_id': exchangeId}, - ); - } - - static kickClassFromExchange(String classId, String exchangeId) { - logEvent( - 'kick_class_from_exchange', - parameters: {'group_id': classId, 'exchange_id': exchangeId}, - ); - } - static joinClass(String classCode) { logEvent('join_group', parameters: {'group_id': classCode}); } diff --git a/lib/pangea/utils/get_chat_list_item_subtitle.dart b/lib/pangea/utils/get_chat_list_item_subtitle.dart index 9d1e45005..5adc0040c 100644 --- a/lib/pangea/utils/get_chat_list_item_subtitle.dart +++ b/lib/pangea/utils/get_chat_list_item_subtitle.dart @@ -3,7 +3,7 @@ import 'package:fluffychat/pangea/constants/language_keys.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'; -import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; @@ -69,9 +69,7 @@ class GetChatListItemSubtitle { timeline: timeline, ownMessage: false, ); - final l2Code = pangeaController.languageController - .activeL2Code(roomID: event.roomId); - + final l2Code = pangeaController.languageController.activeL2Code(); if (l2Code == null || l2Code == LanguageKeys.unknownLanguage) { return event.body; } diff --git a/lib/pangea/utils/instructions.dart b/lib/pangea/utils/instructions.dart index 43350f518..b9eecd799 100644 --- a/lib/pangea/utils/instructions.dart +++ b/lib/pangea/utils/instructions.dart @@ -94,6 +94,7 @@ class InstructionsController { ), cardSize: const Size(300.0, 300.0), transformTargetId: transformTargetKey, + closePrevOverlay: false, ), ); } diff --git a/lib/pangea/utils/overlay.dart b/lib/pangea/utils/overlay.dart index 84e9b9a2a..ce8c63d99 100644 --- a/lib/pangea/utils/overlay.dart +++ b/lib/pangea/utils/overlay.dart @@ -25,9 +25,12 @@ class OverlayUtil { Color? backgroundColor, Alignment? targetAnchor, Alignment? followerAnchor, + bool closePrevOverlay = true, }) { try { - MatrixState.pAnyState.closeOverlay(); + if (closePrevOverlay) { + MatrixState.pAnyState.closeOverlay(); + } final LayerLinkAndKey layerLinkAndKey = MatrixState.pAnyState.layerLinkAndKey(transformTargetId); @@ -58,7 +61,8 @@ class OverlayUtil { ), ); - MatrixState.pAnyState.openOverlay(entry, context); + MatrixState.pAnyState + .openOverlay(entry, context, closePrevOverlay: closePrevOverlay); } catch (err, stack) { debugger(when: kDebugMode); ErrorHandler.logError(e: err, s: stack); @@ -72,6 +76,7 @@ class OverlayUtil { required String transformTargetId, backDropToDismiss = true, Color? borderColor, + bool closePrevOverlay = true, }) { try { final LayerLinkAndKey layerLinkAndKey = @@ -105,6 +110,7 @@ class OverlayUtil { offset: cardOffset, backDropToDismiss: backDropToDismiss, borderColor: borderColor, + closePrevOverlay: closePrevOverlay, ); } catch (err, stack) { debugger(when: kDebugMode); @@ -180,7 +186,7 @@ class OverlayUtil { return Offset(dx, dy); } - static bool get isOverlayOpen => MatrixState.pAnyState.overlay != null; + static bool get isOverlayOpen => MatrixState.pAnyState.entries.isNotEmpty; } class TransparentBackdrop extends StatelessWidget { diff --git a/lib/pangea/utils/report_message.dart b/lib/pangea/utils/report_message.dart index e1dc2d553..2fd218ea9 100644 --- a/lib/pangea/utils/report_message.dart +++ b/lib/pangea/utils/report_message.dart @@ -101,7 +101,7 @@ Future> getReportTeachers( final List otherSpaces = Matrix.of(context) .client - .classesAndExchangesImIn + .spacesImIn .where((space) => !reportRoomParentSpaces.contains(space)) .toList(); diff --git a/lib/pangea/utils/class_code.dart b/lib/pangea/utils/space_code.dart similarity index 81% rename from lib/pangea/utils/class_code.dart rename to lib/pangea/utils/space_code.dart index ca783f755..9b1a44525 100644 --- a/lib/pangea/utils/class_code.dart +++ b/lib/pangea/utils/space_code.dart @@ -6,25 +6,25 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../controllers/pangea_controller.dart'; -class ClassCodeUtil { +class SpaceCodeUtil { static const codeLength = 6; - static bool isValidCode(String? classcode) { - return classcode == null || classcode.length > 4; + static bool isValidCode(String? spacecode) { + return spacecode == null || spacecode.length > 4; } - static String generateClassCode() { + static String generateSpaceCode() { final r = Random(); const chars = 'AaBbCcDdEeFfGgHhiJjKkLMmNnoPpQqRrSsTtUuVvWwXxYyZz1234567890'; return List.generate(codeLength, (index) => chars[r.nextInt(chars.length)]) .join(); } - static Future joinWithClassCodeDialog( + static Future joinWithSpaceCodeDialog( BuildContext context, PangeaController pangeaController, ) async { - final List? classCode = await showTextInputDialog( + final List? spaceCode = await showTextInputDialog( context: context, title: L10n.of(context)!.joinWithClassCode, okLabel: L10n.of(context)!.ok, @@ -33,10 +33,10 @@ class ClassCodeUtil { DialogTextField(hintText: L10n.of(context)!.joinWithClassCodeHint), ], ); - if (classCode == null || classCode.single.isEmpty) return; + if (spaceCode == null || spaceCode.single.isEmpty) return; await pangeaController.classController.joinClasswithCode( context, - classCode.first, + spaceCode.first, ); } diff --git a/lib/pangea/widgets/chat/message_buttons.dart b/lib/pangea/widgets/chat/message_buttons.dart new file mode 100644 index 000000000..f7748675f --- /dev/null +++ b/lib/pangea/widgets/chat/message_buttons.dart @@ -0,0 +1,96 @@ +import 'package:fluffychat/pangea/enum/message_mode_enum.dart'; +import 'package:fluffychat/pangea/widgets/chat/message_toolbar.dart'; +import 'package:flutter/material.dart'; + +class MessageButtons extends StatelessWidget { + final ToolbarDisplayController? toolbarController; + + const MessageButtons({ + super.key, + this.toolbarController, + }); + + void showActivity(BuildContext context) { + toolbarController?.showToolbar( + context, + mode: MessageMode.practiceActivity, + ); + } + + @override + Widget build(BuildContext context) { + if (toolbarController == null) { + return const SizedBox.shrink(); + } + return Padding( + padding: const EdgeInsets.only(right: 8.0), + child: Row( + children: [ + HoverIconButton( + icon: MessageMode.practiceActivity.icon, + onTap: () => showActivity(context), + primaryColor: Theme.of(context).colorScheme.primary, + tooltip: MessageMode.practiceActivity.tooltip(context), + ), + + // Additional buttons can be added here in the future + ], + ), + ); + } +} + +class HoverIconButton extends StatefulWidget { + final IconData icon; + final VoidCallback onTap; + final Color primaryColor; + final String tooltip; + + const HoverIconButton({ + super.key, + required this.icon, + required this.onTap, + required this.primaryColor, + required this.tooltip, + }); + + @override + _HoverIconButtonState createState() => _HoverIconButtonState(); +} + +class _HoverIconButtonState extends State { + bool _isHovered = false; + + @override + Widget build(BuildContext context) { + return Tooltip( + message: widget.tooltip, + child: InkWell( + onTap: widget.onTap, + onHover: (hovering) { + setState(() => _isHovered = hovering); + }, + borderRadius: BorderRadius.circular(100), + child: Container( + decoration: BoxDecoration( + color: _isHovered ? widget.primaryColor : null, + borderRadius: BorderRadius.circular(100), + border: Border.all( + width: 1, + color: widget.primaryColor, + ), + ), + padding: const EdgeInsets.all(2), + child: Icon( + widget.icon, + size: 18, + // when hovered, use themeData to get background color, otherwise use primary + color: _isHovered + ? Theme.of(context).scaffoldBackgroundColor + : widget.primaryColor, + ), + ), + ), + ); + } +} diff --git a/lib/pangea/widgets/chat/message_speech_to_text_card.dart b/lib/pangea/widgets/chat/message_speech_to_text_card.dart index 663e39ffe..9099b9b95 100644 --- a/lib/pangea/widgets/chat/message_speech_to_text_card.dart +++ b/lib/pangea/widgets/chat/message_speech_to_text_card.dart @@ -35,13 +35,9 @@ class MessageSpeechToTextCardState extends State { STTToken? selectedToken; String? get l1Code => - MatrixState.pangeaController.languageController.activeL1Code( - roomID: widget.messageEvent.room.id, - ); + MatrixState.pangeaController.languageController.activeL1Code(); String? get l2Code => - MatrixState.pangeaController.languageController.activeL2Code( - roomID: widget.messageEvent.room.id, - ); + MatrixState.pangeaController.languageController.activeL2Code(); // look for transcription in message event // if not found, call API to transcribe audio diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart index ba508906b..2468d6b96 100644 --- a/lib/pangea/widgets/chat/message_toolbar.dart +++ b/lib/pangea/widgets/chat/message_toolbar.dart @@ -16,6 +16,7 @@ import 'package:fluffychat/pangea/widgets/chat/message_translation_card.dart'; import 'package:fluffychat/pangea/widgets/chat/message_unsubscribed_card.dart'; import 'package:fluffychat/pangea/widgets/chat/overlay_message.dart'; import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart'; +import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_card.dart'; import 'package:fluffychat/pangea/widgets/user_settings/p_language_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; @@ -135,8 +136,8 @@ class ToolbarDisplayController { backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(100), ); - if (MatrixState.pAnyState.overlay != null) { - overlayId = MatrixState.pAnyState.overlay.hashCode.toString(); + if (MatrixState.pAnyState.entries.isNotEmpty) { + overlayId = MatrixState.pAnyState.entries.last.hashCode.toString(); } if (mode != null) { @@ -150,8 +151,11 @@ class ToolbarDisplayController { bool get highlighted { if (overlayId == null) return false; - if (MatrixState.pAnyState.overlay == null) overlayId = null; - return MatrixState.pAnyState.overlay.hashCode.toString() == overlayId; + if (MatrixState.pAnyState.entries.isEmpty) { + overlayId = null; + return false; + } + return MatrixState.pAnyState.entries.last.hashCode.toString() == overlayId; } } @@ -202,6 +206,12 @@ class MessageToolbarState extends State { return; } + // if there is an uncompleted activity, then show that + // we don't want the user to user the tools to get the answer :P + if (widget.pangeaMessageEvent.hasUncompletedActivity) { + newMode = MessageMode.practiceActivity; + } + if (mounted) { setState(() { currentMode = newMode; @@ -229,6 +239,9 @@ class MessageToolbarState extends State { case MessageMode.definition: showDefinition(); break; + case MessageMode.practiceActivity: + showPracticeActivity(); + break; default: ErrorHandler.logError( e: "Invalid toolbar mode", @@ -286,6 +299,13 @@ class MessageToolbarState extends State { ); } + void showPracticeActivity() { + toolbarContent = PracticeActivityCard( + pangeaMessageEvent: widget.pangeaMessageEvent, + controller: this, + ); + } + void showImage() {} void spellCheck() {} @@ -403,9 +423,11 @@ class MessageToolbarState extends State { message: mode.tooltip(context), child: IconButton( icon: Icon(mode.icon), - color: currentMode == mode - ? Theme.of(context).colorScheme.primary - : null, + color: mode.iconColor( + widget.pangeaMessageEvent, + currentMode, + context, + ), onPressed: () => updateMode(mode), ), ); diff --git a/lib/pangea/widgets/chat/message_translation_card.dart b/lib/pangea/widgets/chat/message_translation_card.dart index b1bae20e5..3d73106c6 100644 --- a/lib/pangea/widgets/chat/message_translation_card.dart +++ b/lib/pangea/widgets/chat/message_translation_card.dart @@ -37,7 +37,9 @@ class MessageTranslationCardState extends State { if (widget.immersionMode) return l1Code; final String? originalWrittenCode = widget.messageEvent.originalWritten?.content.langCode; - return l1Code == originalWrittenCode ? l2Code : l1Code; + return (l1Code == originalWrittenCode || originalWrittenCode == null) + ? l2Code + : l1Code; } Future fetchRepresentation(BuildContext context) async { @@ -107,12 +109,8 @@ class MessageTranslationCardState extends State { @override void initState() { super.initState(); - l1Code = MatrixState.pangeaController.languageController.activeL1Code( - roomID: widget.messageEvent.room.id, - ); - l2Code = MatrixState.pangeaController.languageController.activeL2Code( - roomID: widget.messageEvent.room.id, - ); + l1Code = MatrixState.pangeaController.languageController.activeL1Code(); + l2Code = MatrixState.pangeaController.languageController.activeL2Code(); if (mounted) { setState(() {}); } diff --git a/lib/pangea/widgets/class/add_class_and_invite.dart b/lib/pangea/widgets/class/add_class_and_invite.dart deleted file mode 100644 index 45c84c506..000000000 --- a/lib/pangea/widgets/class/add_class_and_invite.dart +++ /dev/null @@ -1,298 +0,0 @@ -import 'dart:developer'; - -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; - -import '../../../widgets/matrix.dart'; -import '../../utils/error_handler.dart'; -import '../../utils/firebase_analytics.dart'; - -enum AddToClassMode { exchange, chat } - -class AddToClassAndInviteToggles extends StatefulWidget { - final String? roomId; - final bool startOpen; - final Function? setParentState; - final AddToClassMode mode; - - const AddToClassAndInviteToggles({ - super.key, - this.roomId, - this.startOpen = false, - this.setParentState, - required this.mode, - }); - - @override - AddToClassAndInviteState createState() => AddToClassAndInviteState(); -} - -class AddToClassAndInviteState extends State { - late Room? room; - late List parents; - late List possibleParents; - late bool isOpen; - - AddToClassAndInviteState({Key? key}); - - @override - void initState() { - room = widget.roomId != null - ? Matrix.of(context).client.getRoomById(widget.roomId!) - : null; - - if (room != null && room!.isPangeaClass) { - debugger(when: kDebugMode); - ErrorHandler.logError( - m: "should not be able to add class to space, not yet at least", - ); - context.go('/rooms'); - } - - possibleParents = Matrix.of(context) - .client - .rooms - .where( - widget.mode == AddToClassMode.exchange - ? (Room r) => r.isPangeaClass && widget.roomId != r.id - : (Room r) => - (r.isPangeaClass || r.isExchange) && widget.roomId != r.id, - ) - .toList(); - - parents = widget.roomId != null - ? possibleParents - .where( - (r) => - r.spaceChildren.any((room) => room.roomId == widget.roomId), - ) - .toList() - : []; - - isOpen = widget.startOpen; - - super.initState(); - } - - Future addParents(String roomToAddId) async { - final List> addFutures = []; - for (final Room newParent in parents) { - addFutures.add(_addSingleParent(roomToAddId, newParent)); - } - await addFutures.wait; - } - - Future _addSingleParent(String roomToAddId, Room newParent) async { - GoogleAnalytics.addParent(roomToAddId, newParent.classCode); - final List> existingMembers = await Future.wait([ - room?.requestParticipants() ?? Future.value([]), - newParent.requestParticipants(), - ]); - final List roomMembers = existingMembers[0]; - final List spaceMembers = existingMembers[1]; - - final List> inviteFutures = [ - newParent.setSpaceChild(roomToAddId, suggested: true), - ]; - for (final spaceMember - in spaceMembers.where((element) => element.id != room?.client.userID)) { - if (!roomMembers.any( - (m) => m.id == spaceMember.id && m.membership == Membership.join, - )) { - inviteFutures.add(_inviteSpaceMember(spaceMember)); - } else { - debugPrint('User ${spaceMember.id} is already in the room'); - } - } - await Future.wait(inviteFutures); - return; - } - - //function for kicking single student and haandling error - Future _kickSpaceMember(User spaceMember) async { - try { - await room?.kick(spaceMember.id); - debugPrint('Kicked ${spaceMember.id}'); - } catch (e) { - debugger(when: kDebugMode); - ErrorHandler.logError(e: e); - } - } - - //function for adding single student and haandling error - Future _inviteSpaceMember(User spaceMember) async { - try { - await room?.invite(spaceMember.id); - debugPrint('added ${spaceMember.id}'); - } catch (e) { - debugger(when: kDebugMode); - ErrorHandler.logError(e: e); - } - } - - //remove single class - Future _removeSingleSpaceFromParents( - String roomToRemoveId, - Room spaceToRemove, - ) async { - GoogleAnalytics.removeChatFromClass( - roomToRemoveId, - spaceToRemove.classCode, - ); - - if (room == null) { - ErrorHandler.logError(m: 'Room is null in kickSpaceMembers'); - debugger(when: kDebugMode); - return; - } - final List> roomsMembers = await Future.wait([ - room?.requestParticipants() ?? Future.value([]), - spaceToRemove.requestParticipants(), - ]); - - final List toKick = roomsMembers[1] - .where( - (element) => - element.id != room?.client.userID && - roomsMembers[0].any((m) => m.id == element.id), - ) - .toList(); - - final List> kickFutures = [ - spaceToRemove.removeSpaceChild(roomToRemoveId), - ]; - for (final spaceMember in toKick) { - kickFutures.add(_kickSpaceMember(spaceMember)); - } - await Future.wait(kickFutures); - - // if (widget.setParentState != null) { - // widget.setParentState!(); - // } - await room?.requestParticipants(); - - if (room != null) { - GoogleAnalytics.kickClassFromExchange(room!.id, spaceToRemove.id); - } - return; - } - - // ignore: curly_braces_in_flow_control_structures - Future _handleAdd(bool add, Room possibleParent) async { - //in this case, the room has already been made so we handle adding as it happens - if (room != null) { - await showFutureLoadingDialog( - context: context, - future: () async { - await (add - ? _addSingleParent(room!.id, possibleParent) - : _removeSingleSpaceFromParents(room!.id, possibleParent)); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - add - ? L10n.of(context)!.youAddedToSpace( - room!.name, - possibleParent.name, - ) - : L10n.of(context)!.youRemovedFromSpace( - room!.name, - possibleParent.name, - ), - ), - ), - ); - }, - ); - } - setState( - () => add - ? parents.add(possibleParent) - : parents.removeWhere((r) => r.id == possibleParent.id), - ); - } - - @override - Widget build(BuildContext context) { - return Column( - children: [ - if (!widget.startOpen) - ListTile( - enableFeedback: !widget.startOpen, - title: Text( - widget.mode == AddToClassMode.exchange - ? L10n.of(context)!.addToClass - : L10n.of(context)!.addToClassOrExchange, - style: TextStyle( - color: Theme.of(context).colorScheme.secondary, - fontWeight: FontWeight.bold, - ), - ), - leading: CircleAvatar( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - foregroundColor: Theme.of(context).textTheme.bodyLarge!.color, - child: const Icon( - Icons.workspaces_outline, - ), - ), - trailing: !widget.startOpen - ? Icon( - isOpen - ? Icons.keyboard_arrow_down_outlined - : Icons.keyboard_arrow_right_outlined, - ) - : null, - onTap: () => setState(() => isOpen = !isOpen), - ), - if (isOpen) - Padding( - padding: const EdgeInsets.fromLTRB(16.0, 0, 16.0, 0), - child: Column( - children: [ - if (possibleParents.isEmpty) - ListTile( - title: Text(L10n.of(context)!.noEligibleSpaces), - ), - ListView.builder( - shrinkWrap: true, - itemCount: possibleParents.length, - itemBuilder: (BuildContext context, int i) { - final bool canIAddSpaceChildren = - possibleParents[i].canIAddSpaceChild(room) && - (room?.canIAddSpaceParents ?? true); - return Column( - children: [ - Opacity( - opacity: canIAddSpaceChildren ? 1 : 0.5, - child: SwitchListTile.adaptive( - title: possibleParents[i].nameAndRoomTypeIcon(), - activeColor: AppConfig.activeToggleColor, - value: parents - .any((r) => r.id == possibleParents[i].id), - onChanged: (bool add) => canIAddSpaceChildren - ? _handleAdd(add, possibleParents[i]) - : ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: - Text(L10n.of(context)!.noPermission), - ), - ), - ), - ), - ], - ); - }, - ), - ], - ), - ), - ], - ); - } -} diff --git a/lib/pangea/widgets/class/add_space_toggles.dart b/lib/pangea/widgets/class/add_space_toggles.dart index c2ed32efe..abbef7746 100644 --- a/lib/pangea/widgets/class/add_space_toggles.dart +++ b/lib/pangea/widgets/class/add_space_toggles.dart @@ -10,21 +10,20 @@ import 'package:matrix/matrix.dart'; import '../../../widgets/matrix.dart'; import '../../utils/firebase_analytics.dart'; -import 'add_class_and_invite.dart'; //PTODO - auto invite students when you add a space and delete the add_class_and_invite.dart file class AddToSpaceToggles extends StatefulWidget { final String? roomId; final bool startOpen; final String? activeSpaceId; - final AddToClassMode mode; + final bool spaceMode; const AddToSpaceToggles({ super.key, this.roomId, this.startOpen = false, this.activeSpaceId, - required this.mode, + this.spaceMode = false, }); @override @@ -42,6 +41,19 @@ class AddToSpaceState extends State { @override void initState() { + initialize(); + super.initState(); + } + + @override + void didUpdateWidget(AddToSpaceToggles oldWidget) { + if (oldWidget.roomId != widget.roomId) { + initialize(); + } + super.didUpdateWidget(oldWidget); + } + + void initialize() { //if roomId is null, it means this widget is being used in the creation flow room = widget.roomId != null ? Matrix.of(context).client.getRoomById(widget.roomId!) @@ -54,10 +66,7 @@ class AddToSpaceState extends State { .client .rooms .where( - widget.mode == AddToClassMode.exchange - ? (Room r) => r.isPangeaClass && widget.roomId != r.id - : (Room r) => - (r.isPangeaClass || r.isExchange) && widget.roomId != r.id, + (Room r) => r.isSpace && widget.roomId != r.id, ) .toList(); @@ -96,7 +105,6 @@ class AddToSpaceState extends State { }); isOpen = widget.startOpen; - super.initState(); } Future _addSingleSpace(String roomToAddId, Room newParent) async { @@ -144,13 +152,10 @@ class AddToSpaceState extends State { Widget getAddToSpaceToggleItem(int index) { final Room possibleParent = possibleParents[index]; - final bool canAdd = (room?.isSpace ?? false) - // Room is space - ? possibleParent.isRoomAdmin && - room!.isRoomAdmin && - possibleParent.canAddAsParentOf(room) - // Room is null or chat - : possibleParent.canAddAsParentOf(room); + final bool canAdd = possibleParent.canAddAsParentOf( + room, + spaceMode: widget.spaceMode, + ); return Opacity( opacity: canAdd ? 1 : 0.5, @@ -189,24 +194,21 @@ class AddToSpaceState extends State { @override Widget build(BuildContext context) { - final String title = widget.mode == AddToClassMode.exchange - ? L10n.of(context)!.addToClass - : L10n.of(context)!.addToClassOrExchange; - final String subtitle = widget.mode == AddToClassMode.exchange - ? L10n.of(context)!.addToClassDesc - : L10n.of(context)!.addToClassOrExchangeDesc; - return Column( children: [ ListTile( title: Text( - title, + L10n.of(context)!.addToSpace, style: TextStyle( color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.bold, ), ), - subtitle: Text(subtitle), + subtitle: Text( + widget.spaceMode || (room?.isSpace ?? false) + ? L10n.of(context)!.addSpaceToSpaceDesc + : L10n.of(context)!.addChatToSpaceDesc, + ), leading: CircleAvatar( backgroundColor: Theme.of(context).scaffoldBackgroundColor, foregroundColor: Theme.of(context).textTheme.bodyLarge!.color, @@ -227,13 +229,21 @@ class AddToSpaceState extends State { ? Column( children: [ SwitchListTile.adaptive( - title: Text(L10n.of(context)!.suggestToChat), + title: Text( + widget.spaceMode || (room?.isSpace ?? false) + ? L10n.of(context)!.suggestToSpace + : L10n.of(context)!.suggestToChat, + ), secondary: Icon( isSuggested ? Icons.visibility_outlined : Icons.visibility_off_outlined, ), - subtitle: Text(L10n.of(context)!.suggestToChatDesc), + subtitle: Text( + widget.spaceMode || (room?.isSpace ?? false) + ? L10n.of(context)!.suggestToSpaceDesc + : L10n.of(context)!.suggestToChatDesc, + ), activeColor: AppConfig.activeToggleColor, value: isSuggested, onChanged: (bool add) => setSuggested(add), diff --git a/lib/pangea/widgets/class/invite_students_from_class.dart b/lib/pangea/widgets/class/invite_students_from_class.dart deleted file mode 100644 index 70bafeb7d..000000000 --- a/lib/pangea/widgets/class/invite_students_from_class.dart +++ /dev/null @@ -1,342 +0,0 @@ -// import 'dart:developer'; - -// import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; -// import 'package:flutter/foundation.dart'; -// import 'package:flutter/material.dart'; -// import 'package:flutter_gen/gen_l10n/l10n.dart'; -// import 'package:future_loading_dialog/future_loading_dialog.dart'; -// import 'package:matrix/matrix.dart'; - -// import '../../../utils/matrix_sdk_extensions/matrix_locals.dart'; -// import '../../../widgets/avatar.dart'; -// import '../../../widgets/matrix.dart'; -// import '../../utils/error_handler.dart'; -// import '../../utils/firebase_analytics.dart'; - -// class InviteStudentsFromClass extends StatefulWidget { -// final String? roomId; -// final bool startOpen; -// final Function setParentState; - -// const InviteStudentsFromClass({ -// Key? key, -// this.roomId, -// this.startOpen = false, -// required this.setParentState, -// }) : super(key: key); - -// @override -// InviteStudentsFromClassState createState() => InviteStudentsFromClassState(); -// } - -// class InviteStudentsFromClassState extends State { -// late Room? room; -// late List otherSpaces; -// late bool isOpen; -// final List invitedSpaces = []; -// final List kickedSpaces = []; - -// InviteStudentsFromClassState({Key? key, cont}); - -// @override -// void initState() { -// room = widget.roomId != null -// ? Matrix.of(context).client.getRoomById(widget.roomId!) -// : null; - -// otherSpaces = Matrix.of(context) -// .client -// .rooms -// .where((r) => r.isPangeaClass && r.id != widget.roomId) -// .toList(); - -// isOpen = widget.startOpen; - -// super.initState(); -// } - -// Future inviteSpaceMembers(BuildContext context, Room spaceToInvite) => -// showFutureLoadingDialog( -// context: context, -// future: () async { -// if (room == null) { -// ErrorHandler.logError(m: 'Room is null in inviteSpaceMembers'); -// debugger(when: kDebugMode); -// return; -// } -// final List> existingMembers = await Future.wait([ -// room!.requestParticipants(), -// spaceToInvite.requestParticipants(), -// ]); -// final List roomMembers = existingMembers[0]; -// final List spaceMembers = existingMembers[1]; -// final List> inviteFutures = []; -// for (final spaceMember in spaceMembers -// .where((element) => element.id != room!.client.userID)) { -// if (!roomMembers.any((m) => -// m.id == spaceMember.id && m.membership == Membership.join)) { -// inviteFutures.add(inviteSpaceMember(spaceMember)); -// //add to invitedSpaces -// invitedSpaces.add(spaceToInvite.id); -// //if in kickedSpaces, remove -// kickedSpaces.remove(spaceToInvite.id); -// } else { -// debugPrint('User ${spaceMember.id} is already in the room'); -// } -// } -// await Future.wait(inviteFutures); -// debugPrint('Invited ${spaceMembers.length} members'); -// GoogleAnalytics.inviteClassToExchange(room!.id, spaceToInvite.id); -// // setState(() { -// // widget.setParentState(); -// // }); -// }, -// onError: handleError, -// ); - -// //function for kicking single student and haandling error -// Future kickSpaceMember(User spaceMember) async { -// try { -// await room!.kick(spaceMember.id); -// debugPrint('Kicked ${spaceMember.id}'); -// } catch (e) { -// debugger(when: kDebugMode); -// ErrorHandler.logError(e: e); -// } -// } - -// //function for adding single student and haandling error -// Future inviteSpaceMember(User spaceMember) async { -// try { -// await room!.invite(spaceMember.id); -// debugPrint('added ${spaceMember.id}'); -// } catch (e) { -// debugger(when: kDebugMode); -// ErrorHandler.logError(e: e); -// } -// } - -// Future kickSpaceMembers(BuildContext context, Room spaceToKick) => -// showFutureLoadingDialog( -// context: context, -// future: () async { -// if (room == null) { -// ErrorHandler.logError(m: 'Room is null in kickSpaceMembers'); -// debugger(when: kDebugMode); -// return; -// } -// final List> existingMembers = await Future.wait([ -// room!.requestParticipants(), -// spaceToKick.requestParticipants(), -// ]); -// final List roomMembers = existingMembers[0]; -// final List spaceMembers = existingMembers[1]; -// final List toKick = spaceMembers -// .where((element) => -// element.id != room!.client.userID && -// roomMembers.any((m) => m.id == element.id)) -// .toList(); -// //add to kickedSpaces -// kickedSpaces.add(spaceToKick.id); -// //if in invitedSpaces, remove from invitedSpaces -// invitedSpaces.remove(spaceToKick.id); -// final List> kickFutures = []; - -// for (final spaceMember in toKick) { -// kickFutures.add(kickSpaceMember(spaceMember)); -// } -// await Future.wait(kickFutures); -// GoogleAnalytics.kickClassFromExchange(room!.id, spaceToKick.id); -// setState(() { -// widget.setParentState(); -// }); -// return; -// }, -// onError: handleError, -// ); - -// String handleError(dynamic exception) { -// ErrorHandler.logError( -// e: exception, m: 'Error inviting or kicking students'); -// ScaffoldMessenger.of(context).showSnackBar( -// SnackBar( -// content: Text(exception.toString()), -// ), -// ); -// return exception.toString(); -// } - -// @override -// Widget build(BuildContext context) { -// if (room == null) return Container(); -// return Column( -// children: [ -// ListTile( -// title: Text( -// L10n.of(context)!.inviteStudentsFromOtherClasses, -// style: TextStyle( -// color: Theme.of(context).colorScheme.secondary, -// fontWeight: FontWeight.bold, -// ), -// ), -// leading: CircleAvatar( -// backgroundColor: Theme.of(context).primaryColor, -// foregroundColor: Colors.white, -// radius: Avatar.defaultSize / 2, -// child: const Icon(Icons.workspaces_outlined), -// ), -// trailing: Icon( -// isOpen -// ? Icons.keyboard_arrow_down_outlined -// : Icons.keyboard_arrow_right_outlined, -// ), -// onTap: () => setState(() => isOpen = !isOpen), -// ), -// if (isOpen) -// Padding( -// padding: const EdgeInsets.fromLTRB(16.0, 0, 16.0, 0), -// child: Column( -// children: [ -// if (otherSpaces.isEmpty) -// ListTile(title: Text(L10n.of(context)!.noEligibleSpaces)), -// ListView.builder( -// shrinkWrap: true, -// itemCount: otherSpaces.length, -// itemBuilder: (BuildContext context, int i) { -// final bool canIAddSpaceChildren = -// otherSpaces[i].canIAddSpaceChild(room); -// return Column( -// children: [ -// Opacity( -// opacity: canIAddSpaceChildren ? 1 : 0.5, -// child: InviteKickClass( -// room: otherSpaces[i], -// inviteCallback: (Room room) => -// inviteSpaceMembers(context, otherSpaces[i]), -// kickCallback: (Room room) => -// kickSpaceMembers(context, otherSpaces[i]), -// controller: this, -// ), -// ), -// ], -// ); -// }, -// ), -// ], -// ), -// ), -// // END: ed8c6549bwf9 -// ], -// ); -// } -// } - -// //listTile with two buttons - one to invite all students in the class and the other to kick them all out -// // parameters -// // 1. Room -// // 2. invite callback -// // 3. kick callback -// // when the user clicks either button, a dialog pops up asking for confirmation -// // after the dialog is confirmed, the callback is executed -// class InviteKickClass extends StatelessWidget { -// final Room room; -// final Function inviteCallback; -// final Function kickCallback; -// final InviteStudentsFromClassState controller; - -// const InviteKickClass({ -// Key? key, -// required this.room, -// required this.inviteCallback, -// required this.kickCallback, -// required this.controller, -// }) : super(key: key); - -// @override -// Widget build(BuildContext context) { -// return ListTile( -// title: Text( -// room.getLocalizedDisplayname( -// MatrixLocals(L10n.of(context)!), -// ), -// ), -// leading: const SizedBox( -// height: Avatar.defaultSize, -// width: Avatar.defaultSize, -// ), -// trailing: Row( -// mainAxisSize: MainAxisSize.min, -// children: [ -// IconButton( -// icon: const Icon(Icons.add), -// isSelected: controller.invitedSpaces.contains(room.id), -// onPressed: () async { -// final bool? result = await showDialog( -// context: context, -// builder: (BuildContext context) => AlertDialog( -// title: Text( -// L10n.of(context)!.inviteAllStudents, -// style: TextStyle( -// color: Theme.of(context).colorScheme.secondary, -// fontWeight: FontWeight.bold, -// ), -// ), -// content: Text( -// L10n.of(context)!.inviteAllStudentsConfirmation, -// ), -// actions: [ -// TextButton( -// onPressed: () => Navigator.of(context).pop(false), -// child: Text(L10n.of(context)!.cancel), -// ), -// TextButton( -// onPressed: () => Navigator.of(context).pop(true), -// child: Text(L10n.of(context)!.ok), -// ), -// ], -// ), -// ); -// if (result != null && result) { -// inviteCallback(room); -// } -// }, -// ), -// IconButton( -// icon: const Icon(Icons.remove), -// isSelected: controller.kickedSpaces.contains(room.id), -// onPressed: () async { -// final bool? result = await showDialog( -// context: context, -// builder: (BuildContext context) => AlertDialog( -// title: Text( -// L10n.of(context)!.kickAllStudents, -// style: TextStyle( -// color: Theme.of(context).colorScheme.secondary, -// fontWeight: FontWeight.bold, -// ), -// ), -// content: Text( -// L10n.of(context)!.kickAllStudentsConfirmation, -// ), -// actions: [ -// TextButton( -// onPressed: () => Navigator.of(context).pop(false), -// child: Text(L10n.of(context)!.cancel), -// ), -// TextButton( -// onPressed: () => Navigator.of(context).pop(true), -// child: Text(L10n.of(context)!.ok), -// ), -// ], -// ), -// ); -// if (result != null && result) { -// kickCallback(room); -// } -// }, -// ), -// ], -// ), -// ); -// } -// } diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart index 6684dcca7..f1f9816bc 100644 --- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart +++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart @@ -20,14 +20,12 @@ class ConversationBotSettings extends StatefulWidget { final Room? room; final bool startOpen; final String? activeSpaceId; - // final ClassSettingsModel? initialSettings; const ConversationBotSettings({ super.key, this.room, this.startOpen = false, this.activeSpaceId, - // this.initialSettings, }); @override @@ -55,9 +53,6 @@ class ConversationBotSettingsState extends State { parentSpace = widget.activeSpaceId != null ? Matrix.of(context).client.getRoomById(widget.activeSpaceId!) : null; - if (parentSpace != null && botOptions.languageLevel == null) { - botOptions.languageLevel = parentSpace?.classSettings?.languageLevel; - } } Future updateBotOption(void Function() makeLocalChange) async { diff --git a/lib/pangea/widgets/igc/pangea_rich_text.dart b/lib/pangea/widgets/igc/pangea_rich_text.dart index cee67cafd..bbd6868bf 100644 --- a/lib/pangea/widgets/igc/pangea_rich_text.dart +++ b/lib/pangea/widgets/igc/pangea_rich_text.dart @@ -2,7 +2,6 @@ import 'dart:developer'; import 'dart:ui'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; @@ -191,19 +190,6 @@ class PangeaRichTextState extends State { : richText; } - bool get areLanguagesSet => - userL2LangCode != null && userL2LangCode != LanguageKeys.unknownLanguage; - - String? get userL2LangCode => - pangeaController.languageController.activeL2Code( - roomID: widget.pangeaMessageEvent.room.id, - ); - - String? get userL1LangCode => - pangeaController.languageController.activeL1Code( - roomID: widget.pangeaMessageEvent.room.id, - ); - Future onIgnore() async { debugPrint("PTODO implement onIgnore"); } diff --git a/lib/pangea/widgets/igc/word_data_card.dart b/lib/pangea/widgets/igc/word_data_card.dart index 4b8445417..5a785c795 100644 --- a/lib/pangea/widgets/igc/word_data_card.dart +++ b/lib/pangea/widgets/igc/word_data_card.dart @@ -61,10 +61,8 @@ class WordDataCardController extends State { @override void initState() { if (!mounted) return; - activeL1 = - controller.languageController.activeL1Model(roomID: widget.room.id)!; - activeL2 = - controller.languageController.activeL2Model(roomID: widget.room.id)!; + activeL1 = controller.languageController.activeL1Model()!; + activeL2 = controller.languageController.activeL2Model()!; if (activeL1 == null || activeL2 == null) { wordNetError = noLanguages; definitionError = noLanguages; diff --git a/lib/pangea/widgets/practice_activity/generate_practice_activity.dart b/lib/pangea/widgets/practice_activity/generate_practice_activity.dart new file mode 100644 index 000000000..1eae97d63 --- /dev/null +++ b/lib/pangea/widgets/practice_activity/generate_practice_activity.dart @@ -0,0 +1,61 @@ +import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +class GeneratePracticeActivityButton extends StatelessWidget { + final PangeaMessageEvent pangeaMessageEvent; + final Function(PracticeActivityEvent?) onActivityGenerated; + + const GeneratePracticeActivityButton({ + super.key, + required this.pangeaMessageEvent, + required this.onActivityGenerated, + }); + + //TODO - probably disable the generation of activities for specific messages + @override + Widget build(BuildContext context) { + return ElevatedButton( + onPressed: () async { + final String? l2Code = MatrixState.pangeaController.languageController + .activeL1Model() + ?.langCode; + + if (l2Code == null) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(L10n.of(context)!.noLanguagesSet), + ), + ); + return; + } + + final PracticeActivityEvent? practiceActivityEvent = await MatrixState + .pangeaController.practiceGenerationController + .getPracticeActivity( + PracticeActivityRequest( + candidateMessages: [ + CandidateMessage( + msgId: pangeaMessageEvent.eventId, + roomId: pangeaMessageEvent.room.id, + text: + pangeaMessageEvent.representationByLanguage(l2Code)?.text ?? + pangeaMessageEvent.body, + ), + ], + userIds: pangeaMessageEvent.room.client.userID != null + ? [pangeaMessageEvent.room.client.userID!] + : null, + ), + pangeaMessageEvent, + ); + + onActivityGenerated(practiceActivityEvent); + }, + child: Text(L10n.of(context)!.practice), + ); + } +} diff --git a/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart b/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart new file mode 100644 index 000000000..c2861ffe0 --- /dev/null +++ b/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart @@ -0,0 +1,69 @@ +import 'package:collection/collection.dart'; +import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart'; +import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_content.dart'; +import 'package:flutter/material.dart'; + +class MultipleChoiceActivity extends StatelessWidget { + final MessagePracticeActivityContentState card; + final Function(int) updateChoice; + final bool isActive; + + const MultipleChoiceActivity({ + super.key, + required this.card, + required this.updateChoice, + required this.isActive, + }); + + PracticeActivityEvent get practiceEvent => card.practiceEvent; + + int? get selectedChoiceIndex => card.selectedChoiceIndex; + + bool get submitted => card.recordSubmittedThisSession; + + @override + Widget build(BuildContext context) { + final PracticeActivityModel practiceActivity = + practiceEvent.practiceActivity; + + return Container( + padding: const EdgeInsets.all(8), + child: Column( + children: [ + Text( + practiceActivity.multipleChoice!.question, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 8), + ChoicesArray( + isLoading: false, + uniqueKeyForLayerLink: (index) => "multiple_choice_$index", + originalSpan: "placeholder", + onPressed: updateChoice, + selectedChoiceIndex: selectedChoiceIndex, + choices: practiceActivity.multipleChoice!.choices + .mapIndexed( + (index, value) => Choice( + text: value, + color: (selectedChoiceIndex == index || + practiceActivity.multipleChoice! + .isCorrect(index)) && + submitted + ? practiceActivity.multipleChoice!.choiceColor(index) + : null, + isGold: practiceActivity.multipleChoice!.isCorrect(index), + ), + ) + .toList(), + isActive: isActive, + ), + ], + ), + ); + } +} diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart new file mode 100644 index 000000000..17c528b22 --- /dev/null +++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart @@ -0,0 +1,108 @@ +import 'dart:developer'; + +import 'package:fluffychat/pangea/enum/message_mode_enum.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; +import 'package:fluffychat/pangea/utils/bot_style.dart'; +import 'package:fluffychat/pangea/widgets/chat/message_toolbar.dart'; +import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_content.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +class PracticeActivityCard extends StatefulWidget { + final PangeaMessageEvent pangeaMessageEvent; + final MessageToolbarState controller; + + const PracticeActivityCard({ + super.key, + required this.pangeaMessageEvent, + required this.controller, + }); + + @override + MessagePracticeActivityCardState createState() => + MessagePracticeActivityCardState(); +} + +class MessagePracticeActivityCardState extends State { + PracticeActivityEvent? practiceEvent; + + @override + void initState() { + super.initState(); + loadInitialData(); + } + + String? get langCode { + final String? langCode = MatrixState.pangeaController.languageController + .activeL2Model() + ?.langCode; + + if (langCode == null) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text(L10n.of(context)!.noLanguagesSet)), + ); + debugger(when: kDebugMode); + return null; + } + return langCode; + } + + void loadInitialData() { + if (langCode == null) return; + updatePracticeActivity(); + if (practiceEvent == null) { + debugger(when: kDebugMode); + } + } + + void updatePracticeActivity() { + if (langCode == null) return; + final List activities = + widget.pangeaMessageEvent.practiceActivities(langCode!); + if (activities.isEmpty) return; + final List incompleteActivities = + activities.where((element) => !element.isComplete).toList(); + debugPrint("total events: ${activities.length}"); + debugPrint("incomplete practice events: ${incompleteActivities.length}"); + + // TODO update to show next activity + practiceEvent = activities.first; + // // if an incomplete activity is found, show that + // if (incompleteActivities.isNotEmpty) { + // practiceEvent = incompleteActivities.first; + // } + // // if no incomplete activity is found, show the last activity + // else if (activities.isNotEmpty) { + // practiceEvent = activities.last; + // } + setState(() {}); + } + + void showNextActivity() { + if (langCode == null) return; + updatePracticeActivity(); + widget.controller.updateMode(MessageMode.practiceActivity); + } + + @override + Widget build(BuildContext context) { + if (practiceEvent == null) { + return Text( + L10n.of(context)!.noActivitiesFound, + style: BotStyle.text(context), + ); + // return GeneratePracticeActivityButton( + // pangeaMessageEvent: widget.pangeaMessageEvent, + // onActivityGenerated: updatePracticeActivity, + // ); + } + return PracticeActivityContent( + practiceEvent: practiceEvent!, + pangeaMessageEvent: widget.pangeaMessageEvent, + controller: this, + ); + } +} diff --git a/lib/pangea/widgets/practice_activity/practice_activity_content.dart b/lib/pangea/widgets/practice_activity/practice_activity_content.dart new file mode 100644 index 000000000..8080c27ee --- /dev/null +++ b/lib/pangea/widgets/practice_activity/practice_activity_content.dart @@ -0,0 +1,165 @@ +import 'package:collection/collection.dart'; +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/enum/activity_type_enum.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_acitivity_record_event.dart'; +import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart'; +import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/pangea/widgets/practice_activity/multiple_choice_activity.dart'; +import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_card.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +class PracticeActivityContent extends StatefulWidget { + final PracticeActivityEvent practiceEvent; + final PangeaMessageEvent pangeaMessageEvent; + final MessagePracticeActivityCardState controller; + + const PracticeActivityContent({ + super.key, + required this.practiceEvent, + required this.pangeaMessageEvent, + required this.controller, + }); + + @override + MessagePracticeActivityContentState createState() => + MessagePracticeActivityContentState(); +} + +class MessagePracticeActivityContentState + extends State { + int? selectedChoiceIndex; + PracticeActivityRecordModel? recordModel; + bool recordSubmittedThisSession = false; + bool recordSubmittedPreviousSession = false; + + PracticeActivityEvent get practiceEvent => widget.practiceEvent; + + @override + void initState() { + super.initState(); + initalizeActivity(); + } + + @override + void didUpdateWidget(covariant PracticeActivityContent oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.practiceEvent.event.eventId != + widget.practiceEvent.event.eventId) { + initalizeActivity(); + } + } + + void initalizeActivity() { + final PracticeActivityRecordEvent? recordEvent = + widget.practiceEvent.userRecords.firstOrNull; + if (recordEvent?.record == null) { + recordModel = PracticeActivityRecordModel( + question: + widget.practiceEvent.practiceActivity.multipleChoice!.question, + ); + } else { + recordModel = recordEvent!.record; + + //Note that only MultipleChoice activities will have this so we probably should move this logic to the MultipleChoiceActivity widget + selectedChoiceIndex = recordModel?.latestResponse != null + ? widget.practiceEvent.practiceActivity.multipleChoice + ?.choiceIndex(recordModel!.latestResponse!) + : null; + + recordSubmittedPreviousSession = true; + recordSubmittedThisSession = true; + } + setState(() {}); + } + + void updateChoice(int index) { + setState(() { + selectedChoiceIndex = index; + recordModel!.addResponse( + text: widget + .practiceEvent.practiceActivity.multipleChoice!.choices[index], + ); + }); + } + + Widget get activityWidget { + switch (widget.practiceEvent.practiceActivity.activityType) { + case ActivityTypeEnum.multipleChoice: + return MultipleChoiceActivity( + card: this, + updateChoice: updateChoice, + isActive: + !recordSubmittedPreviousSession && !recordSubmittedThisSession, + ); + default: + return const SizedBox.shrink(); + } + } + + void sendRecord() { + MatrixState.pangeaController.activityRecordController + .send( + recordModel!, + widget.practiceEvent, + ) + .catchError((error) { + ErrorHandler.logError( + e: error, + s: StackTrace.current, + data: { + 'recordModel': recordModel?.toJson(), + 'practiceEvent': widget.practiceEvent.event.toJson(), + }, + ); + return null; + }).then((_) => widget.controller.showNextActivity()); + + setState(() { + recordSubmittedThisSession = true; + }); + } + + @override + Widget build(BuildContext context) { + debugPrint( + "MessagePracticeActivityContentState.build with selectedChoiceIndex: $selectedChoiceIndex", + ); + return Column( + children: [ + activityWidget, + const SizedBox(height: 8), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Opacity( + opacity: selectedChoiceIndex != null && + !recordSubmittedThisSession && + !recordSubmittedPreviousSession + ? 1.0 + : 0.5, + child: TextButton( + onPressed: () { + if (recordSubmittedThisSession || + recordSubmittedPreviousSession) { + return; + } + selectedChoiceIndex != null ? sendRecord() : null; + }, + style: ButtonStyle( + backgroundColor: WidgetStateProperty.all( + AppConfig.primaryColor, + ), + ), + child: Text(L10n.of(context)!.submit), + ), + ), + ], + ), + ], + ); + } +} diff --git a/lib/pangea/widgets/space/class_settings.dart b/lib/pangea/widgets/space/class_settings.dart deleted file mode 100644 index c9743befd..000000000 --- a/lib/pangea/widgets/space/class_settings.dart +++ /dev/null @@ -1,183 +0,0 @@ -import 'dart:developer'; - -import 'package:fluffychat/pangea/models/class_model.dart'; -import 'package:fluffychat/pangea/widgets/space/language_level_dropdown.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:matrix/matrix.dart'; - -import '../../../widgets/matrix.dart'; -import '../../constants/language_keys.dart'; -import '../../constants/pangea_event_types.dart'; -import '../../controllers/language_list_controller.dart'; -import '../../controllers/pangea_controller.dart'; -import '../../extensions/pangea_room_extension/pangea_room_extension.dart'; -import '../../models/language_model.dart'; -import '../../utils/error_handler.dart'; -import '../user_settings/p_language_dropdown.dart'; -import '../user_settings/p_question_container.dart'; - -class ClassSettings extends StatefulWidget { - final String? roomId; - final bool startOpen; - final ClassSettingsModel? initialSettings; - - const ClassSettings({ - super.key, - this.roomId, - this.startOpen = false, - this.initialSettings, - }); - - @override - ClassSettingsState createState() => ClassSettingsState(); -} - -class ClassSettingsState extends State { - Room? room; - late ClassSettingsModel classSettings; - late bool isOpen; - final PangeaController pangeaController = MatrixState.pangeaController; - - final cityController = TextEditingController(); - final countryController = TextEditingController(); - final schoolController = TextEditingController(); - - ClassSettingsState({Key? key}); - - @override - void initState() { - room = widget.roomId != null - ? Matrix.of(context).client.getRoomById(widget.roomId!) - : null; - - classSettings = - room?.classSettings ?? widget.initialSettings ?? ClassSettingsModel(); - - isOpen = widget.startOpen; - - super.initState(); - } - - bool get sameLanguages => - classSettings.targetLanguage == classSettings.dominantLanguage; - - LanguageModel getLanguage({required bool isBase, required String? langCode}) { - final LanguageModel backup = isBase - ? pangeaController.pLanguageStore.baseOptions.first - : pangeaController.pLanguageStore.targetOptions.first; - if (langCode == null) return backup; - final LanguageModel byCode = PangeaLanguage.byLangCode(langCode); - return byCode.langCode != LanguageKeys.unknownLanguage ? byCode : backup; - } - - Future updatePermission(void Function() makeLocalRuleChange) async { - makeLocalRuleChange(); - if (room != null) { - await showFutureLoadingDialog( - context: context, - future: () => setClassSettings(room!.id), - ); - } - setState(() {}); - } - - void setTextControllerValues() { - classSettings.city = cityController.text; - classSettings.country = countryController.text; - classSettings.schoolName = schoolController.text; - } - - Future setClassSettings(String roomId) async { - try { - setTextControllerValues(); - - await Matrix.of(context).client.setRoomStateWithKey( - roomId, - PangeaEventTypes.classSettings, - '', - classSettings.toJson(), - ); - } catch (err, stack) { - debugger(when: kDebugMode); - ErrorHandler.logError(e: err, s: stack); - } - } - - @override - Widget build(BuildContext context) => Column( - children: [ - ListTile( - title: Text( - L10n.of(context)!.classSettings, - style: TextStyle( - color: Theme.of(context).colorScheme.secondary, - fontWeight: FontWeight.bold, - ), - ), - subtitle: Text(L10n.of(context)!.classSettingsDesc), - leading: CircleAvatar( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - foregroundColor: Theme.of(context).textTheme.bodyLarge!.color, - child: const Icon(Icons.language), - ), - trailing: Icon( - isOpen - ? Icons.keyboard_arrow_down_outlined - : Icons.keyboard_arrow_right_outlined, - ), - onTap: () => setState(() => isOpen = !isOpen), - ), - if (isOpen) - AnimatedContainer( - duration: const Duration(milliseconds: 300), - height: isOpen ? null : 0, - child: Padding( - padding: const EdgeInsets.fromLTRB(16.0, 0, 16.0, 8.0), - child: Column( - children: [ - PQuestionContainer( - title: L10n.of(context)!.selectClassRoomDominantLanguage, - ), - PLanguageDropdown( - onChange: (p0) => updatePermission(() { - classSettings.dominantLanguage = p0.langCode; - }), - initialLanguage: getLanguage( - isBase: true, - langCode: classSettings.dominantLanguage, - ), - languages: pangeaController.pLanguageStore.baseOptions, - showMultilingual: true, - ), - PQuestionContainer( - title: L10n.of(context)!.selectTargetLanguage, - ), - PLanguageDropdown( - onChange: (p0) => updatePermission(() { - classSettings.targetLanguage = p0.langCode; - }), - initialLanguage: getLanguage( - isBase: false, - langCode: classSettings.targetLanguage, - ), - languages: pangeaController.pLanguageStore.targetOptions, - ), - PQuestionContainer( - title: L10n.of(context)!.whatIsYourClassLanguageLevel, - ), - LanguageLevelDropdown( - initialLevel: classSettings.languageLevel, - onChanged: (int? newValue) => updatePermission(() { - classSettings.languageLevel = newValue!; - }), - ), - ], - ), - ), - ), - ], - ); -} diff --git a/lib/pangea/widgets/space/language_settings.dart b/lib/pangea/widgets/space/language_settings.dart new file mode 100644 index 000000000..97af7b34d --- /dev/null +++ b/lib/pangea/widgets/space/language_settings.dart @@ -0,0 +1,184 @@ +// import 'dart:developer'; + +// import 'package:fluffychat/pangea/models/space_model.dart'; +// import 'package:fluffychat/pangea/widgets/space/language_level_dropdown.dart'; +// import 'package:flutter/foundation.dart'; +// import 'package:flutter/material.dart'; +// import 'package:flutter_gen/gen_l10n/l10n.dart'; +// import 'package:future_loading_dialog/future_loading_dialog.dart'; +// import 'package:matrix/matrix.dart'; + +// import '../../../widgets/matrix.dart'; +// import '../../constants/language_keys.dart'; +// import '../../constants/pangea_event_types.dart'; +// import '../../controllers/language_list_controller.dart'; +// import '../../controllers/pangea_controller.dart'; +// import '../../extensions/pangea_room_extension/pangea_room_extension.dart'; +// import '../../models/language_model.dart'; +// import '../../utils/error_handler.dart'; +// import '../user_settings/p_language_dropdown.dart'; +// import '../user_settings/p_question_container.dart'; + +// class LanguageSettings extends StatefulWidget { +// final String? roomId; +// final bool startOpen; +// final LanguageSettingsModel? initialSettings; + +// const LanguageSettings({ +// super.key, +// this.roomId, +// this.startOpen = false, +// this.initialSettings, +// }); + +// @override +// LanguageSettingsState createState() => LanguageSettingsState(); +// } + +// class LanguageSettingsState extends State { +// Room? room; +// late LanguageSettingsModel languageSettings; +// late bool isOpen; +// final PangeaController pangeaController = MatrixState.pangeaController; + +// final cityController = TextEditingController(); +// final countryController = TextEditingController(); +// final schoolController = TextEditingController(); + +// LanguageSettingsState({Key? key}); + +// @override +// void initState() { +// room = widget.roomId != null +// ? Matrix.of(context).client.getRoomById(widget.roomId!) +// : null; + +// languageSettings = room?.languageSettings ?? +// widget.initialSettings ?? +// LanguageSettingsModel(); + +// isOpen = widget.startOpen; + +// super.initState(); +// } + +// bool get sameLanguages => +// languageSettings.targetLanguage == languageSettings.dominantLanguage; + +// LanguageModel getLanguage({required bool isBase, required String? langCode}) { +// final LanguageModel backup = isBase +// ? pangeaController.pLanguageStore.baseOptions.first +// : pangeaController.pLanguageStore.targetOptions.first; +// if (langCode == null) return backup; +// final LanguageModel byCode = PangeaLanguage.byLangCode(langCode); +// return byCode.langCode != LanguageKeys.unknownLanguage ? byCode : backup; +// } + +// Future updatePermission(void Function() makeLocalRuleChange) async { +// makeLocalRuleChange(); +// if (room != null) { +// await showFutureLoadingDialog( +// context: context, +// future: () => setLanguageSettings(room!.id), +// ); +// } +// setState(() {}); +// } + +// void setTextControllerValues() { +// languageSettings.city = cityController.text; +// languageSettings.country = countryController.text; +// languageSettings.schoolName = schoolController.text; +// } + +// Future setLanguageSettings(String roomId) async { +// try { +// setTextControllerValues(); + +// await Matrix.of(context).client.setRoomStateWithKey( +// roomId, +// PangeaEventTypes.languageSettings, +// '', +// languageSettings.toJson(), +// ); +// } catch (err, stack) { +// debugger(when: kDebugMode); +// ErrorHandler.logError(e: err, s: stack); +// } +// } + +// @override +// Widget build(BuildContext context) => Column( +// children: [ +// ListTile( +// title: Text( +// L10n.of(context)!.languageSettings, +// style: TextStyle( +// color: Theme.of(context).colorScheme.secondary, +// fontWeight: FontWeight.bold, +// ), +// ), +// subtitle: Text(L10n.of(context)!.languageSettingsDesc), +// leading: CircleAvatar( +// backgroundColor: Theme.of(context).scaffoldBackgroundColor, +// foregroundColor: Theme.of(context).textTheme.bodyLarge!.color, +// child: const Icon(Icons.language), +// ), +// trailing: Icon( +// isOpen +// ? Icons.keyboard_arrow_down_outlined +// : Icons.keyboard_arrow_right_outlined, +// ), +// onTap: () => setState(() => isOpen = !isOpen), +// ), +// if (isOpen) +// AnimatedContainer( +// duration: const Duration(milliseconds: 300), +// height: isOpen ? null : 0, +// child: Padding( +// padding: const EdgeInsets.fromLTRB(16.0, 0, 16.0, 8.0), +// child: Column( +// children: [ +// PQuestionContainer( +// title: L10n.of(context)!.selectSpaceDominantLanguage, +// ), +// PLanguageDropdown( +// onChange: (p0) => updatePermission(() { +// languageSettings.dominantLanguage = p0.langCode; +// }), +// initialLanguage: getLanguage( +// isBase: true, +// langCode: languageSettings.dominantLanguage, +// ), +// languages: pangeaController.pLanguageStore.baseOptions, +// showMultilingual: true, +// ), +// PQuestionContainer( +// title: L10n.of(context)!.selectSpaceTargetLanguage, +// ), +// PLanguageDropdown( +// onChange: (p0) => updatePermission(() { +// languageSettings.targetLanguage = p0.langCode; +// }), +// initialLanguage: getLanguage( +// isBase: false, +// langCode: languageSettings.targetLanguage, +// ), +// languages: pangeaController.pLanguageStore.targetOptions, +// ), +// PQuestionContainer( +// title: L10n.of(context)!.whatIsYourSpaceLanguageLevel, +// ), +// LanguageLevelDropdown( +// initialLevel: languageSettings.languageLevel, +// onChanged: (int? newValue) => updatePermission(() { +// languageSettings.languageLevel = newValue!; +// }), +// ), +// ], +// ), +// ), +// ), +// ], +// ); +// } diff --git a/lib/pangea/widgets/subscription/subscription_options.dart b/lib/pangea/widgets/subscription/subscription_options.dart index 41c8cbe4f..d40f68023 100644 --- a/lib/pangea/widgets/subscription/subscription_options.dart +++ b/lib/pangea/widgets/subscription/subscription_options.dart @@ -109,7 +109,7 @@ class SubscriptionCard extends StatelessWidget { title ?? subscription?.displayName(context) ?? '', textAlign: TextAlign.center, style: TextStyle( - fontSize: 24, + fontSize: 20, color: enabled ? null : const Color.fromARGB(255, 174, 174, 174), ), diff --git a/lib/pangea/widgets/user_settings/p_language_dialog.dart b/lib/pangea/widgets/user_settings/p_language_dialog.dart index 4d09b506e..51082a7e6 100644 --- a/lib/pangea/widgets/user_settings/p_language_dialog.dart +++ b/lib/pangea/widgets/user_settings/p_language_dialog.dart @@ -98,7 +98,6 @@ pLanguageDialog(BuildContext parentContext, Function callback) async { Navigator.pop(context); } catch (err, s) { debugger(when: kDebugMode); - //PTODO-Lala add standard error message ErrorHandler.logError(e: err, s: s); rethrow; } finally { diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index 1422c0dc1..1d5e1fe66 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -111,7 +111,7 @@ abstract class ClientManager { // To make room emotes work 'im.ponies.room_emotes', // #Pangea - PangeaEventTypes.classSettings, + PangeaEventTypes.languageSettings, PangeaEventTypes.rules, PangeaEventTypes.botOptions, EventTypes.RoomTopic, diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index e9bcf6bd8..bd4cf0a66 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -1,9 +1,7 @@ import 'dart:async'; import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/utils/download_chat.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -49,13 +47,6 @@ class ChatSettingsPopupMenuState extends State { @override Widget build(BuildContext context) { - // #Pangea - final PangeaController pangeaController = MatrixState.pangeaController; - final ClassSettingsModel? classSettings = pangeaController - .matrixState.client - .getRoomById(widget.room.id) - ?.firstLanguageSettings; - // Pangea# notificationChangeSub ??= Matrix.of(context) .client .onSync @@ -151,7 +142,6 @@ class ChatSettingsPopupMenuState extends State { context: context, future: () => downloadChat( widget.room, - classSettings!, DownloadType.txt, Matrix.of(context).client, context, @@ -163,7 +153,6 @@ class ChatSettingsPopupMenuState extends State { context: context, future: () => downloadChat( widget.room, - classSettings!, DownloadType.csv, Matrix.of(context).client, context, @@ -175,7 +164,6 @@ class ChatSettingsPopupMenuState extends State { context: context, future: () => downloadChat( widget.room, - classSettings!, DownloadType.xlsx, Matrix.of(context).client, context, @@ -189,6 +177,17 @@ class ChatSettingsPopupMenuState extends State { } }, itemBuilder: (BuildContext context) => [ + if (widget.displayChatDetails) + PopupMenuItem( + value: ChatPopupMenuActions.details, + child: Row( + children: [ + const Icon(Icons.info_outline_rounded), + const SizedBox(width: 12), + Text(L10n.of(context)!.chatDetails), + ], + ), + ), // #Pangea PopupMenuItem( value: ChatPopupMenuActions.learningSettings, @@ -201,17 +200,6 @@ class ChatSettingsPopupMenuState extends State { ), ), // Pangea# - if (widget.displayChatDetails) - PopupMenuItem( - value: ChatPopupMenuActions.details, - child: Row( - children: [ - const Icon(Icons.info_outline_rounded), - const SizedBox(width: 12), - Text(L10n.of(context)!.chatDetails), - ], - ), - ), if (widget.room.pushRuleState == PushRuleState.notify) PopupMenuItem( value: ChatPopupMenuActions.mute, @@ -270,39 +258,36 @@ class ChatSettingsPopupMenuState extends State { ], ), ), - if (classSettings != null) - PopupMenuItem( - value: ChatPopupMenuActions.downloadTxt, - child: Row( - children: [ - const Icon(Icons.download_outlined), - const SizedBox(width: 12), - Text(L10n.of(context)!.downloadTxtFile), - ], - ), + PopupMenuItem( + value: ChatPopupMenuActions.downloadTxt, + child: Row( + children: [ + const Icon(Icons.download_outlined), + const SizedBox(width: 12), + Text(L10n.of(context)!.downloadTxtFile), + ], ), - if (classSettings != null) - PopupMenuItem( - value: ChatPopupMenuActions.downloadCsv, - child: Row( - children: [ - const Icon(Icons.download_outlined), - const SizedBox(width: 12), - Text(L10n.of(context)!.downloadCSVFile), - ], - ), + ), + PopupMenuItem( + value: ChatPopupMenuActions.downloadCsv, + child: Row( + children: [ + const Icon(Icons.download_outlined), + const SizedBox(width: 12), + Text(L10n.of(context)!.downloadCSVFile), + ], ), - if (classSettings != null) - PopupMenuItem( - value: ChatPopupMenuActions.downloadXlsx, - child: Row( - children: [ - const Icon(Icons.download_outlined), - const SizedBox(width: 12), - Text(L10n.of(context)!.downloadXLSXFile), - ], - ), + ), + PopupMenuItem( + value: ChatPopupMenuActions.downloadXlsx, + child: Row( + children: [ + const Icon(Icons.download_outlined), + const SizedBox(width: 12), + Text(L10n.of(context)!.downloadXLSXFile), + ], ), + ), // Pangea# ], ), diff --git a/needed-translations.txt b/needed-translations.txt index 293985cfc..1355bb368 100644 --- a/needed-translations.txt +++ b/needed-translations.txt @@ -5,7 +5,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -53,8 +52,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -66,19 +64,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -243,16 +239,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -706,11 +699,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -729,7 +719,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -754,13 +744,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -866,7 +854,16 @@ "buildTranslation", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "be": [ @@ -953,7 +950,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -996,7 +992,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -1478,8 +1473,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -1491,19 +1485,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -1668,16 +1660,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -2131,11 +2120,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -2154,7 +2140,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -2179,7 +2165,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -2200,7 +2185,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -2369,7 +2353,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "bn": [ @@ -2452,7 +2446,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -2495,7 +2488,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -2977,8 +2969,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -2990,19 +2981,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -3167,16 +3156,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -3630,11 +3616,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -3653,7 +3636,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -3678,7 +3661,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -3699,7 +3681,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -3868,7 +3849,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "bo": [ @@ -3955,7 +3946,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -3998,7 +3988,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -4480,8 +4469,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -4493,19 +4481,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -4670,16 +4656,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -5133,11 +5116,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -5156,7 +5136,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -5181,7 +5161,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -5202,7 +5181,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -5371,7 +5349,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ca": [ @@ -5381,7 +5369,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -5448,8 +5435,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -5461,19 +5447,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -5638,16 +5622,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -6101,11 +6082,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -6124,7 +6102,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -6149,7 +6127,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -6157,7 +6134,6 @@ "knocking", "chatCanBeDiscoveredViaSearchOnServer", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -6276,7 +6252,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "cs": [ @@ -6285,7 +6270,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -6372,8 +6356,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -6385,19 +6368,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -6562,16 +6543,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -7025,11 +7003,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -7048,7 +7023,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -7073,7 +7048,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -7094,7 +7068,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -7263,7 +7236,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "de": [ @@ -7272,7 +7254,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -7320,8 +7301,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -7333,19 +7313,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -7510,16 +7488,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -7973,11 +7948,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -7996,7 +7968,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -8021,13 +7993,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -8133,7 +8103,16 @@ "buildTranslation", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "el": [ @@ -8171,7 +8150,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -8214,7 +8192,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -8696,8 +8673,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -8709,19 +8685,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -8886,16 +8860,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -9349,11 +9320,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -9372,7 +9340,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -9397,7 +9365,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -9418,7 +9385,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -9587,7 +9553,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "eo": [ @@ -9614,7 +9590,6 @@ "sendTypingNotifications", "swipeRightToLeftToReply", "yourChatBackupHasBeenSetUp", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "commandHint_clearcache", @@ -9848,8 +9823,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -9861,19 +9835,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -10038,16 +10010,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -10501,11 +10470,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -10524,7 +10490,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -10549,7 +10515,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -10570,7 +10535,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -10739,54 +10703,31 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "es": [ - "appLockDescription", - "swipeRightToLeftToReply", - "globalChatId", - "accessAndVisibility", - "accessAndVisibilityDescription", - "calls", - "customEmojisAndStickers", - "customEmojisAndStickersBody", - "hideRedactedMessages", - "hideRedactedMessagesBody", - "hideInvalidOrUnknownMessageFormats", - "hideMemberChangesInPublicChats", - "hideMemberChangesInPublicChatsBody", - "overview", - "notifyMeFor", - "passwordRecoverySettings", - "usersMustKnock", - "userWouldLikeToChangeTheChat", - "noPublicLinkHasBeenCreatedYet", - "knock", - "knocking", - "chatCanBeDiscoveredViaSearchOnServer", - "publicChatAddresses", - "createNewAddress", - "userRole", - "minimumPowerLevel", "searchIn", - "searchMore", - "gallery", - "files", "addConversationBotDialogTitleInvite", "addConversationBotButtonInvite", "addConversationBotDialogInviteConfirmation", "addConversationBotButtonTitleRemove", "addConversationBotButtonRemove", "addConversationBotDialogRemoveConfirmation", - "addSpaceToSpaceDescription", - "noDatabaseEncryption", - "thereAreCountUsersBlocked", - "restricted", - "knockRestricted", - "nonexistentSelection", - "cantAddSpaceChild", - "roomAddedToSpace" + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "et": [ @@ -10795,7 +10736,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -10843,8 +10783,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -10856,19 +10795,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -11033,16 +10970,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -11496,11 +11430,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -11519,7 +11450,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -11544,13 +11475,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -11656,7 +11585,16 @@ "buildTranslation", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "eu": [ @@ -11665,7 +11603,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -11713,8 +11650,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -11726,19 +11662,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -11903,16 +11837,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -12366,11 +12297,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -12389,7 +12317,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -12414,13 +12342,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -12528,7 +12454,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "fa": [ @@ -12544,7 +12479,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "createGroup", "createNewGroup", "chatPermissions", @@ -12646,8 +12580,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -12659,19 +12592,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -12836,16 +12767,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -13299,11 +13227,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -13322,7 +13247,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -13347,7 +13272,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -13368,7 +13292,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -13537,7 +13460,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "fi": [ @@ -13547,7 +13479,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -13622,8 +13553,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -13635,19 +13565,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -13812,16 +13740,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -14275,11 +14200,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -14298,7 +14220,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -14323,7 +14245,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -14341,7 +14262,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -14510,7 +14430,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "fil": [ @@ -14519,7 +14448,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -14948,8 +14876,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -14961,19 +14888,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -15138,16 +15063,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -15601,11 +15523,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -15624,7 +15543,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -15649,7 +15568,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -15670,7 +15588,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -15839,7 +15756,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "fr": [ @@ -15852,7 +15778,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "emoteKeyboardNoRecents", @@ -15956,8 +15881,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -15969,19 +15893,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -16146,16 +16068,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -16609,11 +16528,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -16632,7 +16548,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -16657,7 +16573,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -16678,7 +16593,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -16847,7 +16761,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ga": [ @@ -16872,7 +16795,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "commandHint_discardsession", @@ -17093,8 +17015,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -17106,19 +17027,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -17283,16 +17202,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -17746,11 +17662,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -17769,7 +17682,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -17794,7 +17707,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -17815,7 +17727,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -17984,7 +17895,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "gl": [ @@ -17993,7 +17913,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -18041,8 +17960,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -18054,19 +17972,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -18231,16 +18147,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -18694,11 +18607,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -18717,7 +18627,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -18742,13 +18652,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -18854,7 +18762,16 @@ "buildTranslation", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "he": [ @@ -18880,7 +18797,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "createGroup", @@ -19219,8 +19135,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -19232,19 +19147,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -19409,16 +19322,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -19872,11 +19782,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -19895,7 +19802,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -19920,7 +19827,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -19941,7 +19847,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -20110,7 +20015,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "hi": [ @@ -20190,7 +20104,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -20233,7 +20146,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -20715,8 +20627,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -20728,19 +20639,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -20905,16 +20814,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -21368,11 +21274,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -21391,7 +21294,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -21416,7 +21319,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -21437,7 +21339,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -21606,7 +21507,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "hr": [ @@ -21616,7 +21527,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -21684,8 +21594,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -21697,19 +21606,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -21874,16 +21781,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -22337,11 +22241,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -22360,7 +22261,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -22385,7 +22286,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -22401,7 +22301,6 @@ "knocking", "chatCanBeDiscoveredViaSearchOnServer", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -22555,7 +22454,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "hu": [ @@ -22564,7 +22472,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -22618,8 +22525,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -22631,19 +22537,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -22808,16 +22712,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -23271,11 +23172,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -23294,7 +23192,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -23319,14 +23217,12 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "knocking", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -23441,7 +23337,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ia": [ @@ -23514,7 +23419,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -23557,7 +23461,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -24039,8 +23942,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -24052,19 +23954,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -24229,16 +24129,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -24692,11 +24589,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -24715,7 +24609,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -24740,7 +24634,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -24761,7 +24654,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -24930,7 +24822,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "id": [ @@ -24939,7 +24841,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -24987,8 +24888,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -25000,19 +24900,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -25177,16 +25075,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -25640,11 +25535,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -25663,7 +25555,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -25688,13 +25580,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -25806,7 +25696,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ie": [ @@ -25853,7 +25752,6 @@ "yourChatBackupHasBeenSetUp", "chatBackupDescription", "chatHasBeenAddedToThisSpace", - "classes", "chooseAStrongPassword", "commandHint_markasdm", "commandHint_ban", @@ -26175,8 +26073,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -26188,19 +26085,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -26365,16 +26260,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -26828,11 +26720,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -26851,7 +26740,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -26876,7 +26765,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -26897,7 +26785,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -27066,7 +26953,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "it": [ @@ -27076,7 +26972,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -27144,8 +27039,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -27157,19 +27051,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -27334,16 +27226,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -27797,11 +27686,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -27820,7 +27706,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -27845,7 +27731,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -27853,7 +27738,6 @@ "knocking", "chatCanBeDiscoveredViaSearchOnServer", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -27993,7 +27877,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ja": [ @@ -28015,7 +27908,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "commandHint_kick", "commandHint_me", "commandHint_op", @@ -28140,8 +28032,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -28153,19 +28044,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -28330,16 +28219,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -28793,11 +28679,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -28816,7 +28699,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -28841,7 +28724,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -28862,7 +28744,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -29031,7 +28912,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ka": [ @@ -29041,7 +28931,6 @@ "alreadyHaveAnAccount", "swipeRightToLeftToReply", "badServerVersionsException", - "classes", "commandHint_markasdm", "createNewGroup", "editChatPermissions", @@ -29497,8 +29386,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -29510,19 +29398,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -29687,16 +29573,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -30150,11 +30033,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -30173,7 +30053,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -30198,7 +30078,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -30219,7 +30098,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -30388,7 +30266,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ko": [ @@ -30397,7 +30284,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -30445,8 +30331,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -30458,19 +30343,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -30635,16 +30518,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -31098,11 +30978,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -31121,7 +30998,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -31146,13 +31023,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -31260,7 +31135,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "lt": [ @@ -31283,7 +31167,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "createGroup", "createNewGroup", "allRooms", @@ -31407,8 +31290,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -31420,19 +31302,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -31597,16 +31477,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -32060,11 +31937,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -32083,7 +31957,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -32108,7 +31982,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -32129,7 +32002,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -32298,7 +32170,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "lv": [ @@ -32307,7 +32188,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -32357,8 +32237,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -32370,19 +32249,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -32547,16 +32424,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -33010,11 +32884,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -33033,7 +32904,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -33058,13 +32929,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -33176,7 +33045,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "nb": [ @@ -33203,7 +33081,6 @@ "yourChatBackupHasBeenSetUp", "chatHasBeenAddedToThisSpace", "chats", - "classes", "clearArchive", "commandHint_markasdm", "commandHint_markasgroup", @@ -33228,7 +33105,6 @@ "commandInvalid", "commandMissing", "createGroup", - "createNewSpace", "createNewGroup", "allRooms", "chatPermissions", @@ -33487,8 +33363,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -33500,19 +33375,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -33677,16 +33550,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -34140,11 +34010,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -34163,7 +34030,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -34188,7 +34055,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -34209,7 +34075,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -34378,7 +34243,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "nl": [ @@ -34388,7 +34263,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -34463,8 +34337,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -34476,19 +34349,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -34653,16 +34524,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -35116,11 +34984,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -35139,7 +35004,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -35164,7 +35029,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -35175,7 +35039,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -35344,7 +35207,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "pl": [ @@ -35354,7 +35226,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -35428,8 +35299,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -35441,19 +35311,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -35618,16 +35486,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -36081,11 +35946,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -36104,7 +35966,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -36129,7 +35991,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -36150,7 +36011,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -36319,7 +36179,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "pt": [ @@ -36401,7 +36270,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "commandHint_markasdm", @@ -36442,7 +36310,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -36909,8 +36776,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -36922,19 +36788,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -37099,16 +36963,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -37562,11 +37423,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -37585,7 +37443,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -37610,7 +37468,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -37631,7 +37488,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -37800,7 +37656,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "pt_BR": [ @@ -37809,7 +37675,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -37857,8 +37722,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -37870,19 +37734,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -38047,16 +37909,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -38510,11 +38369,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -38533,7 +38389,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -38558,13 +38414,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -38676,7 +38530,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "pt_PT": [ @@ -38701,7 +38564,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "createGroup", @@ -38988,8 +38850,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -39001,19 +38862,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -39178,16 +39037,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -39641,11 +39497,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -39664,7 +39517,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -39689,7 +39542,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -39710,7 +39562,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -39879,7 +39730,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ro": [ @@ -39896,7 +39756,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "createGroup", "createNewGroup", "chatPermissions", @@ -39998,8 +39857,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -40011,19 +39869,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -40188,16 +40044,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -40651,11 +40504,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -40674,7 +40524,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -40699,7 +40549,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -40720,7 +40569,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -40889,7 +40737,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ru": [ @@ -40898,7 +40755,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -40946,8 +40802,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -40959,19 +40814,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -41136,16 +40989,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -41599,11 +41449,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -41622,7 +41469,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -41647,13 +41494,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -41765,7 +41610,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "sk": [ @@ -41795,7 +41649,6 @@ "changeYourAvatar", "chatBackupDescription", "chatHasBeenAddedToThisSpace", - "classes", "clearArchive", "commandHint_markasdm", "commandHint_markasgroup", @@ -41825,7 +41678,6 @@ "contentHasBeenReported", "copyToClipboard", "createGroup", - "createNewSpace", "createNewGroup", "deactivateAccountWarning", "defaultPermissionLevel", @@ -42143,8 +41995,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -42156,19 +42007,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -42333,16 +42182,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -42796,11 +42642,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -42819,7 +42662,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -42844,7 +42687,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -42865,7 +42707,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -43034,7 +42875,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "sl": [ @@ -43060,7 +42911,6 @@ "appLockDescription", "sendTypingNotifications", "swipeRightToLeftToReply", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "commandHint_clearcache", @@ -43542,8 +43392,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -43555,19 +43404,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -43732,16 +43579,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -44195,11 +44039,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -44218,7 +44059,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -44243,7 +44084,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -44264,7 +44104,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -44433,7 +44272,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "sr": [ @@ -44466,7 +44314,6 @@ "cantOpenUri", "yourChatBackupHasBeenSetUp", "chatHasBeenAddedToThisSpace", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "commandHint_clearcache", @@ -44477,7 +44324,6 @@ "commandInvalid", "commandMissing", "createGroup", - "createNewSpace", "createNewGroup", "allRooms", "chatPermissions", @@ -44715,8 +44561,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -44728,19 +44573,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -44905,16 +44748,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -45368,11 +45208,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -45391,7 +45228,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -45416,7 +45253,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -45437,7 +45273,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -45606,7 +45441,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "sv": [ @@ -45616,7 +45461,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -45683,8 +45527,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -45696,19 +45539,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -45873,16 +45714,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -46336,11 +46174,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -46359,7 +46194,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -46384,7 +46219,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -46392,7 +46226,6 @@ "knocking", "chatCanBeDiscoveredViaSearchOnServer", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -46513,7 +46346,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "ta": [ @@ -46597,7 +46439,6 @@ "chatDetails", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -46640,7 +46481,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -47122,8 +46962,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -47135,19 +46974,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -47312,16 +47149,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -47775,11 +47609,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -47798,7 +47629,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -47823,7 +47654,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -47844,7 +47674,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -48013,7 +47842,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "th": [ @@ -48058,7 +47897,6 @@ "chatBackupDescription", "chatHasBeenAddedToThisSpace", "chats", - "classes", "chooseAStrongPassword", "clearArchive", "close", @@ -48100,7 +47938,6 @@ "create", "createdTheChat", "createGroup", - "createNewSpace", "createNewGroup", "currentlyActive", "darkTheme", @@ -48576,8 +48413,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -48589,19 +48425,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -48766,16 +48600,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -49229,11 +49060,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -49252,7 +49080,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -49277,7 +49105,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -49298,7 +49125,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -49467,7 +49293,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "tr": [ @@ -49476,7 +49312,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -49524,8 +49359,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -49537,19 +49371,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -49714,16 +49546,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -50177,11 +50006,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -50200,7 +50026,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -50225,13 +50051,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -50337,7 +50161,16 @@ "buildTranslation", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "uk": [ @@ -50347,7 +50180,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "globalChatId", @@ -50414,8 +50246,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -50427,19 +50258,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -50604,16 +50433,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -51067,11 +50893,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -51090,7 +50913,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -51115,7 +50938,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -51123,7 +50945,6 @@ "knocking", "chatCanBeDiscoveredViaSearchOnServer", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -51244,7 +51065,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "vi": [ @@ -51276,7 +51106,6 @@ "yourChatBackupHasBeenSetUp", "chatHasBeenAddedToThisSpace", "chats", - "classes", "clearArchive", "commandHint_markasdm", "commandHint_markasgroup", @@ -51307,7 +51136,6 @@ "copiedToClipboard", "copyToClipboard", "createGroup", - "createNewSpace", "createNewGroup", "darkTheme", "defaultPermissionLevel", @@ -51725,8 +51553,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -51738,19 +51565,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -51915,16 +51740,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -52378,11 +52200,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -52401,7 +52220,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -52426,7 +52245,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -52436,7 +52254,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -52599,7 +52416,17 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "zh": [ @@ -52608,7 +52435,6 @@ "addNewFriend", "alreadyHaveAnAccount", "swipeRightToLeftToReply", - "classes", "createNewGroup", "editChatPermissions", "enterAGroupName", @@ -52656,8 +52482,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -52669,19 +52494,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -52846,16 +52669,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -53309,11 +53129,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -53332,7 +53149,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -53357,13 +53174,11 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", "noTeachersFound", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -53469,7 +53284,16 @@ "buildTranslation", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ], "zh_Hant": [ @@ -53479,7 +53303,6 @@ "alreadyHaveAnAccount", "appLockDescription", "swipeRightToLeftToReply", - "classes", "commandHint_markasdm", "commandHint_markasgroup", "commandHint_html", @@ -53489,7 +53312,6 @@ "commandHint_react", "commandHint_send", "createGroup", - "createNewSpace", "createNewGroup", "allRooms", "chatPermissions", @@ -53730,8 +53552,7 @@ "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", "notYetSet", - "multiLingualClass", - "classAnalytics", + "multiLingualSpace", "allClasses", "myLearning", "allChatsAndClasses", @@ -53743,19 +53564,17 @@ "classDescription", "classDescriptionDesc", "requestToEnroll", - "requestAnExchange", - "findLanguageExchange", - "classAnalyticsDesc", + "spaceAnalyticsDesc", "addStudents", "copyClassLink", "copyClassLinkDesc", "copyClassCode", "inviteStudentByUserName", - "classSettings", - "classSettingsDesc", - "selectClassRoomDominantLanguage", - "selectTargetLanguage", - "whatIsYourClassLanguageLevel", + "languageSettings", + "languageSettingsDesc", + "selectSpaceDominantLanguage", + "selectSpaceTargetLanguage", + "whatIsYourSpaceLanguageLevel", "studentPermissions", "interactiveTranslator", "oneToOneChatsWithinClass", @@ -53920,16 +53739,13 @@ "definitionsToolDescription", "translationsToolDescrption", "welcomeBack", - "classExchanges", "createNewClass", - "newExchange", "kickAllStudents", "kickAllStudentsConfirmation", "inviteAllStudents", "inviteAllStudentsConfirmation", "inviteStudentsFromOtherClasses", "inviteUsersFromPangea", - "allExchanges", "redeemPromoCode", "enterPromoCode", "downloadTxtFile", @@ -54383,11 +54199,8 @@ "allPrivateChats", "unknownPrivateChat", "copyClassCodeDesc", - "addToClass", - "addToClassDesc", - "addToClassOrExchange", - "addToClassOrExchangeDesc", - "invitedToClassOrExchange", + "addToSpaceDesc", + "invitedToSpace", "declinedInvitation", "acceptedInvitation", "youreInvited", @@ -54406,7 +54219,7 @@ "promoSubscriptionExpirationDesc", "emptyChatNameWarning", "emptyClassNameWarning", - "emptyExchangeNameWarning", + "emptySpaceNameWarning", "blurMeansTranslateTitle", "blurMeansTranslateBody", "someErrorTitle", @@ -54431,7 +54244,6 @@ "why", "definition", "exampleSentence", - "addToClassTitle", "reportToTeacher", "reportMessageTitle", "reportMessageBody", @@ -54452,7 +54264,6 @@ "chatCanBeDiscoveredViaSearchOnServer", "searchChatsRooms", "createClass", - "createExchange", "viewArchive", "trialExpiration", "freeTrialDesc", @@ -54620,6 +54431,16 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace" + "roomAddedToSpace", + "createNewSpace", + "addChatToSpaceDesc", + "addSpaceToSpaceDesc", + "spaceAnalytics", + "changeAnalyticsLanguage", + "suggestToSpace", + "suggestToSpaceDesc", + "practice", + "noLanguagesSet", + "noActivitiesFound" ] }