Merge branch 'main' into choreographer-refactor

This commit is contained in:
ggurdin 2025-10-27 10:18:51 -04:00
commit e83f153124
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
62 changed files with 121 additions and 354 deletions

View file

@ -11999,7 +11999,6 @@
"newMessageInPangeaChat": "📩 رسالة جديدة في دردشة بانجيا",
"shareCourse": "مشاركة الدورة",
"addCourse": "إضافة دورة",
"joinCourseWithCode": "الانضمام إلى الدورة باستخدام الرمز",
"joinPublicCourse": "الانضمام إلى دورة عامة",
"vocabLevelsDesc": "هذا هو المكان الذي ستذهب إليه كلمات المفردات بمجرد ترقيتها!",
"highlightVocabTooltip": "قم بتمييز كلمات المفردات المستهدفة أدناه عن طريق إرسالها أو التدرب عليها في الدردشة",
@ -12023,10 +12022,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12881,7 +12881,6 @@
"newMessageInPangeaChat": "💬 Новае паведамленне ў чатзе Pangea",
"shareCourse": "Падзяліцца курсам",
"addCourse": "Дадаць курс",
"joinCourseWithCode": "Далучыцца да курса з кодам",
"joinPublicCourse": "Далучыцца да публічнага курса",
"vocabLevelsDesc": "Тут будуць размяшчацца словы слоўніка, калі вы іх узнясеце ўзровень!",
"highlightVocabTooltip": "Выдзяліце мэтавыя словы слоўніка ніжэй, адпраўляючы іх або практыкуючыся з імі ў чаце",
@ -12905,10 +12904,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12886,7 +12886,6 @@
"newMessageInPangeaChat": "💬 পেঙ্গিয়া চ্যাটে নতুন বার্তা",
"shareCourse": "কোর্স শেয়ার করুন",
"addCourse": "একটি কোর্স যোগ করুন",
"joinCourseWithCode": "কোড দিয়ে কোর্সে যোগ দিন",
"joinPublicCourse": "পাবলিক কোর্সে যোগ দিন",
"vocabLevelsDesc": "এখানে আপনি শব্দের স্তর উন্নত করলে শব্দগুলি যাবে!",
"highlightVocabTooltip": "নিচের লক্ষ্য শব্দগুলো হাইলাইট করুন তাদের পাঠান বা চ্যাটে অনুশীলন করুন",
@ -12910,10 +12909,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11806,7 +11806,6 @@
"newMessageInPangeaChat": "📝 Nou missatge a Pangea Chat",
"shareCourse": "Comparteix el curs",
"addCourse": "Afegeix un curs",
"joinCourseWithCode": "Uneix-te al curs amb un codi",
"joinPublicCourse": "Uneix-te al curs públic",
"vocabLevelsDesc": "Aquí és on aniran les paraules de vocabulari un cop les hagis pujat de nivell!",
"highlightVocabTooltip": "Destaca les paraules de vocabulari objectiu a continuació enviant-les o practicant amb elles al xat",
@ -11830,10 +11829,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12389,7 +12389,6 @@
"newMessageInPangeaChat": "📝 Nová zpráva v chatu Pangea",
"shareCourse": "Sdílet kurz",
"addCourse": "Přidat kurz",
"joinCourseWithCode": "Připojit se ke kurzu s kódem",
"joinPublicCourse": "Připojit se k veřejnému kurzu",
"vocabLevelsDesc": "Zde se objeví slovíčka, jakmile je vylepšíte na vyšší úroveň!",
"highlightVocabTooltip": "Zvýrazněte cílová slovíčka níže jejich odesláním nebo procvičováním v chatu",
@ -12413,10 +12412,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12844,7 +12844,6 @@
"newMessageInPangeaChat": "💬 Ny besked i Pangea Chat",
"shareCourse": "Del kursus",
"addCourse": "Tilføj et kursus",
"joinCourseWithCode": "Deltag i kursus med kode",
"joinPublicCourse": "Deltag i offentligt kursus",
"vocabLevelsDesc": "Her vil ordforrådsord blive placeret, når du har opgraderet dem!",
"highlightVocabTooltip": "Fremhæv målordene nedenfor ved at sende dem eller øve med dem i chatten",
@ -12868,10 +12867,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11789,7 +11789,6 @@
"newMessageInPangeaChat": "🗨️ Neue Nachricht im Pangea-Chat",
"shareCourse": "Kurs teilen",
"addCourse": "Einen Kurs hinzufügen",
"joinCourseWithCode": "Kurs mit Code beitreten",
"joinPublicCourse": "Öffentlichen Kurs beitreten",
"vocabLevelsDesc": "Hier kommen die Vokabeln hin, sobald du sie aufgestuft hast!",
"highlightVocabTooltip": "Hebe die Zielvokabeln unten hervor, indem du sie sendest oder mit ihnen im Chat übst",
@ -11813,10 +11812,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12840,7 +12840,6 @@
"newMessageInPangeaChat": "🔊 Νέο μήνυμα στο Pangea Chat",
"shareCourse": "Μοιράσου το μάθημα",
"addCourse": "Πρόσθεσε ένα μάθημα",
"joinCourseWithCode": "Συνδεθείτε με κωδικό μαθήματος",
"joinPublicCourse": "Συνδεθείτε σε δημόσιο μάθημα",
"vocabLevelsDesc": "Εδώ θα προστεθούν οι λέξεις λεξιλογίου μόλις τις αναβαθμίσετε!",
"highlightVocabTooltip": "Επισημάνετε τις στόχους λέξεις λεξιλογίου παρακάτω στέλνοντάς τες ή εξασκώντας με αυτές στη συνομιλία",
@ -12864,10 +12863,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -5303,7 +5303,6 @@
"placeholders": {}
},
"addCourse": "Add a course",
"joinCourseWithCode": "Join course with code",
"joinPublicCourse": "Join public course",
"vocabLevelsDesc": "This is where vocab words will go once youve leveled them up!",
"highlightVocabTooltip": "Highlight target vocab words below by sending them or practicing with them in the chat",
@ -5315,5 +5314,7 @@
"alreadyInCourseWithID": "You are already in a course with this plan. Do you want to create a course with the same plan, or go to the existing course?",
"goToExistingCourse": "Go to existing course",
"emojiView": "Emoji view",
"feedbackDialogDesc": "I make mistakes too! Anything to help me improve?"
}
"feedbackDialogDesc": "I make mistakes too! Anything to help me improve?",
"getStartedFriendsButton": "Invite a friend",
"contactHasBeenInvitedToTheCourse": "Contact has been invited to the course"
}

View file

@ -12871,7 +12871,6 @@
"newMessageInPangeaChat": "🗨️ Nova mesaĝo en Pangea Babilejo",
"shareCourse": "Dividi kurson",
"addCourse": "Aldoni kurson",
"joinCourseWithCode": "Aliĝi al kurso kun kodo",
"joinPublicCourse": "Aliĝi al publika kurso",
"vocabLevelsDesc": "Jen kie vortoj de vortprovizo iros post kiam vi ilin plibonigos!",
"highlightVocabTooltip": "Emfazu la celvortojn sube per sendado aŭ praktiko kun ili en la babilejo",
@ -12895,10 +12894,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -7389,7 +7389,6 @@
"newMessageInPangeaChat": "🗨️ Nuevo mensaje en Pangea Chat",
"shareCourse": "Compartir curso",
"addCourse": "Agregar un curso",
"joinCourseWithCode": "Unirse al curso con código",
"joinPublicCourse": "Unirse a curso público",
"vocabLevelsDesc": "¡Aquí es donde irán las palabras de vocabulario una vez que las hayas subido de nivel!",
"highlightVocabTooltip": "Resalta las palabras de vocabulario objetivo a continuación enviándolas o practicando con ellas en el chat",
@ -7417,10 +7416,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12049,7 +12049,6 @@
"newMessageInPangeaChat": "🗨️ Uus sõnum Pangea vestluses",
"shareCourse": "Jaga kursust",
"addCourse": "Lisa kursus",
"joinCourseWithCode": "Liitu kursusega koodiga",
"joinPublicCourse": "Liitu avaliku kursusega",
"vocabLevelsDesc": "Siia lähevad sõnad, kui oled need tasemele tõstnud!",
"highlightVocabTooltip": "Tõsta sihitud sõnad allpool esile, saates need või harjutades nendega vestluses",
@ -12077,10 +12076,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11782,7 +11782,6 @@
"newMessageInPangeaChat": "💬 Pangea Txat-ean mezu berria",
"shareCourse": "Partekatu ikastaroa",
"addCourse": "Gehitu ikastaroa",
"joinCourseWithCode": "Hasi ikastaroa kodearekin",
"joinPublicCourse": "Hasi ikastaro publikoa",
"vocabLevelsDesc": "Hemen daude hitz-berriak mailakatzen dituzunean!",
"highlightVocabTooltip": "Azpimarratu behean dauden target hitz-berriak mezuak bidaliz edo praktikatuz txatean",
@ -11806,10 +11805,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12514,7 +12514,6 @@
"newMessageInPangeaChat": "📩 پیام جدید در چت پنگئا",
"shareCourse": "اشتراک‌گذاری دوره",
"addCourse": "افزودن دوره",
"joinCourseWithCode": "پیوستن به دوره با کد",
"joinPublicCourse": "پیوستن به دوره عمومی",
"vocabLevelsDesc": "اینجا جایی است که کلمات واژگان پس از ارتقاء سطح قرار می‌گیرند!",
"highlightVocabTooltip": "کلمات واژگان هدف را در زیر با ارسال یا تمرین در چت برجسته کنید",
@ -12538,10 +12537,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12427,7 +12427,6 @@
"newMessageInPangeaChat": "💬 Uusi viesti Pangea-chatissa",
"shareCourse": "Jaa kurssi",
"addCourse": "Lisää kurssi",
"joinCourseWithCode": "Liity kurssille koodilla",
"joinPublicCourse": "Liity julkiseen kurssiin",
"vocabLevelsDesc": "Tässä kohtaa sanat menevät, kun olet nostanut niiden tasoa!",
"highlightVocabTooltip": "Korosta alla olevat kohdesanat lähettämällä ne tai harjoittelemalla niiden kanssa chatissa",
@ -12451,10 +12450,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12758,7 +12758,6 @@
"newMessageInPangeaChat": "🗨️ Bagong mensahe sa Pangea Chat",
"shareCourse": "Ibahagi ang kurso",
"addCourse": "Magdagdag ng kurso",
"joinCourseWithCode": "Sumali sa kurso gamit ang code",
"joinPublicCourse": "Sumali sa pampublikong kurso",
"vocabLevelsDesc": "Dito mapupunta ang mga salita sa bokabularyo kapag na-level up mo na sila!",
"highlightVocabTooltip": "I-highlight ang mga target na salita sa bokabularyo sa ibaba sa pamamagitan ng pagpapadala ng mga ito o pagsasanay gamit ang mga ito sa chat",
@ -12782,10 +12781,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12106,7 +12106,6 @@
"newMessageInPangeaChat": "💬 Nouveau message dans le chat Pangea",
"shareCourse": "Partager le cours",
"addCourse": "Ajouter un cours",
"joinCourseWithCode": "Rejoindre le cours avec un code",
"joinPublicCourse": "Rejoindre un cours public",
"vocabLevelsDesc": "C'est ici que les mots de vocabulaire seront placés une fois que vous les aurez améliorés !",
"highlightVocabTooltip": "Mettez en évidence les mots de vocabulaire cibles ci-dessous en les envoyant ou en pratiquant avec eux dans le chat",
@ -12130,10 +12129,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11780,7 +11780,6 @@
"newMessageInPangeaChat": "🔊 Teachtaireacht nua i gComhrá Pangea",
"shareCourse": "Comhroinn cúrsa",
"addCourse": "Cuir cúrsa leis",
"joinCourseWithCode": "Cláraigh i gcúrsa le cód",
"joinPublicCourse": "Cláraigh i gcúrsa poiblí",
"vocabLevelsDesc": "Seo áit a dtéann focail fhocail a bhfuil leibhéal acu nuair a dhéantar iad a leibhéalú!",
"highlightVocabTooltip": "Bain úsáid as an téacs thíos chun focail fhocail spriocdhírithe a shoiléiriú trí iad a sheoladh nó trí chleachtadh leo sa chomhrá",
@ -11804,10 +11803,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11779,7 +11779,6 @@
"newMessageInPangeaChat": "🗨️ Novo mensaxe en Pangea Chat",
"shareCourse": "Compartir curso",
"addCourse": "Engadir un curso",
"joinCourseWithCode": "Unirse ao curso con código",
"joinPublicCourse": "Unirse ao curso público",
"vocabLevelsDesc": "Aquí é onde as palabras de vocabulario irán unha vez que as mellores de nivel!",
"highlightVocabTooltip": "Destaca as palabras de vocabulario obxectivo abaixo enviándoas ou practicándoas no chat",
@ -11803,10 +11802,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12831,7 +12831,6 @@
"newMessageInPangeaChat": "📩 הודעה חדשה בצ'אט פאנגיאה",
"shareCourse": "שתף קורס",
"addCourse": "הוסף קורס",
"joinCourseWithCode": "הצטרף לקורס עם קוד",
"joinPublicCourse": "הצטרף לקורס ציבורי",
"vocabLevelsDesc": "זה המקום שבו מילות אוצר המילים יופיעו לאחר שהעלית את רמתן!",
"highlightVocabTooltip": "הדגש את מילות אוצר המילים היעדיות למטה על ידי שליחתן או תרגול איתן בצ'אט",
@ -12855,10 +12854,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12867,7 +12867,6 @@
"newMessageInPangeaChat": "💬 पांगेआ चैट में नया संदेश",
"shareCourse": "कोर्स साझा करें",
"addCourse": "कोर्स जोड़ें",
"joinCourseWithCode": "कोड के साथ कोर्स में शामिल हों",
"joinPublicCourse": "सार्वजनिक कोर्स में शामिल हों",
"vocabLevelsDesc": "यहां वे शब्द जाएंगे जब आप उन्हें स्तर देंगे!",
"highlightVocabTooltip": "नीचे लक्षित शब्दों को हाइलाइट करें उन्हें भेजकर या चैट में अभ्यास करके",
@ -12891,10 +12890,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12154,7 +12154,6 @@
"newMessageInPangeaChat": "💬 Nova poruka u Pangea chatu",
"shareCourse": "Podijeli tečaj",
"addCourse": "Dodaj tečaj",
"joinCourseWithCode": "Pridruži se tečaju s kodom",
"joinPublicCourse": "Pridruži se javnom tečaju",
"vocabLevelsDesc": "Ovdje će ići riječi vokabulara nakon što ih podignete na višu razinu!",
"highlightVocabTooltip": "Istakni ciljne riječi vokabulara ispod tako što ćeš ih poslati ili vježbati s njima u chatu",
@ -12178,10 +12177,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11783,7 +11783,6 @@
"newMessageInPangeaChat": "💬 Új üzenet a Pangea Csevegésben",
"shareCourse": "Kurzus megosztása",
"addCourse": "Kurzus hozzáadása",
"joinCourseWithCode": "Csatlakozás kurzushoz kóddal",
"joinPublicCourse": "Csatlakozás nyilvános kurzushoz",
"vocabLevelsDesc": "Itt jelennek meg a szókincs szavai, amint szintet lépnek!",
"highlightVocabTooltip": "Emelje ki a cél szókincs szavait az alábbiakban azzal, hogy elküldi vagy gyakorolja őket a csevegésben",
@ -11807,10 +11806,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12860,7 +12860,6 @@
"newMessageInPangeaChat": "🗨️ Novy message in Pangea Chat",
"shareCourse": "Partagear curso",
"addCourse": "Adder un curso",
"joinCourseWithCode": "Joiner curso con codice",
"joinPublicCourse": "Joiner curso publice",
"vocabLevelsDesc": "Isto es le loco ubi le vocabularies va in post una vice que tu ha levelate los!",
"highlightVocabTooltip": "Highlight le vocabularies target ci sotto per los inviar o practicar con los in le chat",
@ -12884,10 +12883,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11773,7 +11773,6 @@
"newMessageInPangeaChat": "📝 Pesan baru di Pangea Chat",
"shareCourse": "Bagikan kursus",
"addCourse": "Tambahkan kursus",
"joinCourseWithCode": "Gabung kursus dengan kode",
"joinPublicCourse": "Gabung kursus publik",
"vocabLevelsDesc": "Di sinilah kata-kata kosakata akan ditempatkan setelah Anda meningkatkannya!",
"highlightVocabTooltip": "Sorot kata kosakata target di bawah dengan mengirimkannya atau berlatih dengannya di obrolan",
@ -11797,10 +11796,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12756,7 +12756,6 @@
"newMessageInPangeaChat": "📝 Nov messadi in Pangea Chat",
"shareCourse": "Partagiar corsa",
"addCourse": "Zontar un corsa",
"joinCourseWithCode": "Kumencar corsa cun còde",
"joinPublicCourse": "Kumencar corsa publice",
"vocabLevelsDesc": "Chest è il loc dove i parôls di vocabulari a saran miss in plance une volte che tu o i às nivellâts!",
"highlightVocabTooltip": "Meti in evidenze i parôls di vocabulari cible sot a mandâli o praticâl in te chat",
@ -12780,10 +12779,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11785,7 +11785,6 @@
"newMessageInPangeaChat": "🗨️ Nuovo messaggio in Pangea Chat",
"shareCourse": "Condividi corso",
"addCourse": "Aggiungi un corso",
"joinCourseWithCode": "Unisciti al corso con il codice",
"joinPublicCourse": "Unisciti al corso pubblico",
"vocabLevelsDesc": "Qui andranno le parole di vocabolario una volta che le avrai potenziate!",
"highlightVocabTooltip": "Evidenzia le parole di vocabolario target di seguito inviandole o praticandole nella chat",
@ -11809,10 +11808,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12572,7 +12572,6 @@
"newMessageInPangeaChat": "📩 Pangeaチャットに新しいメッセージ",
"shareCourse": "コースを共有",
"addCourse": "コースを追加",
"joinCourseWithCode": "コードでコースに参加",
"joinPublicCourse": "公開コースに参加",
"vocabLevelsDesc": "これが語彙をレベルアップしたら表示される場所です!",
"highlightVocabTooltip": "チャットで送信したり練習したりして、ターゲット語彙をハイライトしてください",
@ -12596,10 +12595,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12812,7 +12812,6 @@
"newMessageInPangeaChat": "💬 ახალი შეტყობინება Pangea ჩატში",
"shareCourse": "გააზიარე კურსი",
"addCourse": "დაამატე კურსი",
"joinCourseWithCode": "შეერთდი კურსთან კოდის საშუალებით",
"joinPublicCourse": "შეერთდი საჯარო კურსთან",
"vocabLevelsDesc": "ეს არის ადგილი, სადაც სიტყვები განთავსდება, როგორც კი მათ დონე გაუმჯობესდება!",
"highlightVocabTooltip": "მოწერეთ ქვემოთ მიზნობრივი სიტყვები ან პრაქტიკით გამოიყენეთ ისინი ჩატში",
@ -12836,10 +12835,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11890,7 +11890,6 @@
"newMessageInPangeaChat": "💬 Pangea 채팅에 새 메시지",
"shareCourse": "강좌 공유",
"addCourse": "강좌 추가",
"joinCourseWithCode": "코드로 강좌 참여",
"joinPublicCourse": "공개 강좌 참여",
"vocabLevelsDesc": "단어를 레벨업하면 여기에 단어가 표시됩니다!",
"highlightVocabTooltip": "아래 대상 어휘를 채팅에서 보내거나 연습하여 강조 표시하세요",
@ -11914,10 +11913,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12587,7 +12587,6 @@
"newMessageInPangeaChat": "📩 Naujiena žinutė Pangea pokalbyje",
"shareCourse": "Pasidalinti kursu",
"addCourse": "Pridėti kursą",
"joinCourseWithCode": "Prisijungti prie kurso su kodu",
"joinPublicCourse": "Prisijungti prie viešo kurso",
"vocabLevelsDesc": "Čia pateks žodžiai, kai juos pakelsite į aukštesnį lygį!",
"highlightVocabTooltip": "Pažymėkite žemiau esančius tikslinius žodžius siųsdami juos arba praktikuodamiesi su jais pokalbyje",
@ -12611,10 +12610,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11768,7 +11768,6 @@
"newMessageInPangeaChat": "💬 Jauna ziņa Pangea Čatā",
"shareCourse": "Dalīties ar kursu",
"addCourse": "Pievienot kursu",
"joinCourseWithCode": "Pievienoties kursam ar kodu",
"joinPublicCourse": "Pievienoties publiskajam kursam",
"vocabLevelsDesc": "Šeit ietilps vārdu krājuma vārdi, kad jūs tos uzlabosiet līmenī!",
"highlightVocabTooltip": "Izcel mērķa vārdu zemāk, nosūtot tos vai praktizējoties ar tiem čatā",
@ -11792,10 +11791,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12875,7 +12875,6 @@
"newMessageInPangeaChat": "🗨️ Ny melding i Pangea Chat",
"shareCourse": "Del kurs",
"addCourse": "Legg til et kurs",
"joinCourseWithCode": "Bli med på kurs med kode",
"joinPublicCourse": "Bli med på offentlig kurs",
"vocabLevelsDesc": "Dette er hvor vokabularord vil komme når du har nivåert dem opp!",
"highlightVocabTooltip": "Uthev målordene nedenfor ved å sende dem eller øve med dem i chatten",
@ -12899,10 +12898,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11782,7 +11782,6 @@
"newMessageInPangeaChat": "📩 Nieuw bericht in Pangea Chat",
"shareCourse": "Deel cursus",
"addCourse": "Voeg een cursus toe",
"joinCourseWithCode": "Deelname cursus met code",
"joinPublicCourse": "Deelname openbare cursus",
"vocabLevelsDesc": "Hier komen de vocabulaire woorden zodra je ze hebt opgewaardeerd!",
"highlightVocabTooltip": "Markeer doelvocabulaire woorden hieronder door ze te sturen of ermee te oefenen in de chat",
@ -11806,10 +11805,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11782,7 +11782,6 @@
"newMessageInPangeaChat": "📝 Nowa wiadomość w Pangea Chat",
"shareCourse": "Udostępnij kurs",
"addCourse": "Dodaj kurs",
"joinCourseWithCode": "Dołącz do kursu za pomocą kodu",
"joinPublicCourse": "Dołącz do kursu publicznego",
"vocabLevelsDesc": "To tutaj pojawią się słowa słownictwa, gdy je podniesiesz na wyższy poziom!",
"highlightVocabTooltip": "Podświetl docelowe słowa słownictwa poniżej, wysyłając je lub ćwicząc z nimi na czacie",
@ -11806,10 +11805,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12882,7 +12882,6 @@
"newMessageInPangeaChat": "📩 Nova mensagem no Pangea Chat",
"shareCourse": "Compartilhar curso",
"addCourse": "Adicionar um curso",
"joinCourseWithCode": "Entrar no curso com código",
"joinPublicCourse": "Entrar no curso público",
"vocabLevelsDesc": "É aqui que as palavras de vocabulário irão aparecer assim que você as evoluir!",
"highlightVocabTooltip": "Destaque as palavras de vocabulário alvo abaixo enviando-as ou praticando com elas no chat",
@ -12906,10 +12905,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12140,7 +12140,6 @@
"newMessageInPangeaChat": "💬 Nova mensagem no Pangea Chat",
"shareCourse": "Compartilhar curso",
"addCourse": "Adicionar um curso",
"joinCourseWithCode": "Entrar no curso com código",
"joinPublicCourse": "Entrar em curso público",
"vocabLevelsDesc": "É aqui que as palavras de vocabulário irão aparecer assim que você as evoluir!",
"highlightVocabTooltip": "Destaque as palavras de vocabulário alvo abaixo enviando-as ou praticando com elas no chat",
@ -12164,10 +12163,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12811,7 +12811,6 @@
"newMessageInPangeaChat": "📩 Nova mensagem no Pangea Chat",
"shareCourse": "Partilhar curso",
"addCourse": "Adicionar um curso",
"joinCourseWithCode": "Entrar no curso com código",
"joinPublicCourse": "Entrar no curso público",
"vocabLevelsDesc": "É aqui que as palavras de vocabulário irão aparecer assim que as tiveres evoluído!",
"highlightVocabTooltip": "Destaque as palavras de vocabulário alvo abaixo, enviando-as ou praticando com elas no chat",
@ -12835,10 +12834,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12517,7 +12517,6 @@
"newMessageInPangeaChat": "📝 Mesaj nou în Pangea Chat",
"shareCourse": "Partajează cursul",
"addCourse": "Adaugă un curs",
"joinCourseWithCode": "Alătură-te cursului cu cod",
"joinPublicCourse": "Alătură-te cursului public",
"vocabLevelsDesc": "Aici vor fi plasate cuvintele de vocabular odată ce le-ai nivelat!",
"highlightVocabTooltip": " Evidențiază cuvintele țintă de vocabular de mai jos trimițându-le sau exersându-le în chat",
@ -12541,10 +12540,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11887,7 +11887,6 @@
"newMessageInPangeaChat": "🗨️ Новое сообщение в чате Pangea",
"shareCourse": "Поделиться курсом",
"addCourse": "Добавить курс",
"joinCourseWithCode": "Присоединиться к курсу по коду",
"joinPublicCourse": "Присоединиться к публичному курсу",
"vocabLevelsDesc": "Здесь появятся слова словаря, как только вы их повысите!",
"highlightVocabTooltip": "Выделите целевые слова словаря ниже, отправив их или попрактиковавшись с ними в чате",
@ -11911,10 +11910,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12866,7 +12866,6 @@
"newMessageInPangeaChat": "🗨️ Nová správa v Pangea chate",
"shareCourse": "Zdieľať kurz",
"addCourse": "Pridať kurz",
"joinCourseWithCode": "Pripojiť sa ku kurzu s kódom",
"joinPublicCourse": "Pripojiť sa k verejnému kurzu",
"vocabLevelsDesc": "Sem pôjdu slovíčka, keď ich vylepšíte na vyššiu úroveň!",
"highlightVocabTooltip": "Zvýraznite cieľové slovíčka nižšie ich odoslaním alebo precvičovaním v chate",
@ -12890,10 +12889,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12863,7 +12863,6 @@
"newMessageInPangeaChat": "🗨️ Nova sporočilo v klepetu Pangea",
"shareCourse": "Deli tečaj",
"addCourse": "Dodaj tečaj",
"joinCourseWithCode": "Pridruži se tečaju z geslom",
"joinPublicCourse": "Pridruži se javnemu tečaju",
"vocabLevelsDesc": "Tukaj bodo šle besede za besednjak, ko jih boste nadgradili!",
"highlightVocabTooltip": "Označi ciljne besede v besednjaku spodaj tako, da jih pošlješ ali vadiš z njimi v klepetu",
@ -12887,10 +12886,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12884,7 +12884,6 @@
"newMessageInPangeaChat": "🗨️ Novi poruka u Pangea Četu",
"shareCourse": "Podeli kurs",
"addCourse": "Dodaj kurs",
"joinCourseWithCode": "Pridruži se kursu sa kodom",
"joinPublicCourse": "Pridruži se javnom kursu",
"vocabLevelsDesc": "Ovde će ići reči vokabulara nakon što ih podignete na viši nivo!",
"highlightVocabTooltip": "Istakni ciljne reči vokabulara ispod tako što ćeš ih poslati ili vežbati sa njima u chatu",
@ -12908,10 +12907,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12260,7 +12260,6 @@
"newMessageInPangeaChat": "📩 Nytt meddelande i Pangea Chat",
"shareCourse": "Dela kurs",
"addCourse": "Lägg till en kurs",
"joinCourseWithCode": "Gå med i kurs med kod",
"joinPublicCourse": "Gå med i offentlig kurs",
"vocabLevelsDesc": "Det här är platsen där vokabulärord kommer att hamna när du har nivåer upp dem!",
"highlightVocabTooltip": "Markera målord i vokabulär nedan genom att skicka dem eller öva med dem i chatten",
@ -12284,10 +12283,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12006,7 +12006,6 @@
"newMessageInPangeaChat": "💬 பாங்கியா சாட்டில் புதிய செய்தி",
"shareCourse": "பாடத்தைக் பகிரவும்",
"addCourse": "பாடத்தைச் சேர்க்கவும்",
"joinCourseWithCode": "குறியீடு கொண்டு பாடத்தில் சேரவும்",
"joinPublicCourse": "பொது பாடத்தில் சேரவும்",
"vocabLevelsDesc": "நீங்கள் அவற்றை மேம்படுத்தியபின் சொற்பொருள் வார்த்தைகள் இங்கே செல்லும்!",
"highlightVocabTooltip": "சொற்பொருள் வார்த்தைகளை கீழே ஹைலைட் செய்ய, அவற்றை அனுப்பவும் அல்லது சாட்டில் பயிற்சி செய்யவும்",
@ -12030,10 +12029,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12871,7 +12871,6 @@
"newMessageInPangeaChat": "💬 పాంగియా చాట్‌లో కొత్త సందేశం",
"shareCourse": "కోర్సును పంచుకోండి",
"addCourse": "కోర్సును జోడించండి",
"joinCourseWithCode": "కోడ్‌తో కోర్సులో చేరండి",
"joinPublicCourse": "పబ్లిక్ కోర్సులో చేరండి",
"vocabLevelsDesc": "మీరు వాటిని లెవెల్ చేయగానే ఇది వాక్యబోధన పదాలు అక్కడికి పోతాయి!",
"highlightVocabTooltip": "గమ్య వాక్యబోధన పదాలను క్రింద హైలైట్ చేయండి, వాటిని పంపడం లేదా చాట్‌లో ప్రాక్టీస్ చేయడం ద్వారా",
@ -12895,10 +12894,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12840,7 +12840,6 @@
"newMessageInPangeaChat": "📩 ข้อความใหม่ใน Pangea Chat",
"shareCourse": "แชร์หลักสูตร",
"addCourse": "เพิ่มหลักสูตร",
"joinCourseWithCode": "เข้าร่วมหลักสูตรด้วยรหัส",
"joinPublicCourse": "เข้าร่วมหลักสูตรสาธารณะ",
"vocabLevelsDesc": "นี่คือที่ที่คำศัพท์จะไปเมื่อคุณเลเวลอัปมันแล้ว!",
"highlightVocabTooltip": "เน้นคำศัพท์เป้าหมายด้านล่างโดยส่งหรือฝึกฝนกับมันในแชท",
@ -12864,10 +12863,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12004,7 +12004,6 @@
"newMessageInPangeaChat": "🗨️ Pangea Sohbetinde yeni mesaj",
"shareCourse": "Kursu paylaş",
"addCourse": "Bir kurs ekle",
"joinCourseWithCode": "Kod ile kursa katıl",
"joinPublicCourse": "Herkese açık kursa katıl",
"vocabLevelsDesc": "Kelime seviyelerini yükselttiğinizde buraya kelimeler gelir!",
"highlightVocabTooltip": "Hedef kelimeleri aşağıda vurgula, onları göndererek veya sohbetle pratik yaparak",
@ -12028,10 +12027,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11776,7 +11776,6 @@
"newMessageInPangeaChat": "🗨️ Нове повідомлення у чаті Pangea",
"shareCourse": "Поділитися курсом",
"addCourse": "Додати курс",
"joinCourseWithCode": "Приєднатися до курсу за кодом",
"joinPublicCourse": "Приєднатися до публічного курсу",
"vocabLevelsDesc": "Тут з'являться слова словника, коли ви їх підвищите рівень!",
"highlightVocabTooltip": "Виділіть цільові слова словника нижче, надіславши їх або практикуючись із ними у чаті",
@ -11800,10 +11799,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -5719,7 +5719,6 @@
"newMessageInPangeaChat": "🔊 Tin nhắn mới trong Pangea Chat",
"shareCourse": "Chia sẻ khóa học",
"addCourse": "Thêm khóa học",
"joinCourseWithCode": "Tham gia khóa học bằng mã",
"joinPublicCourse": "Tham gia khóa học công khai",
"vocabLevelsDesc": "Đây là nơi các từ vựng sẽ xuất hiện sau khi bạn nâng cấp chúng!",
"highlightVocabTooltip": "Nổi bật các từ vựng mục tiêu bên dưới bằng cách gửi chúng hoặc luyện tập với chúng trong trò chuyện",
@ -5747,10 +5746,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -12873,7 +12873,6 @@
"newMessageInPangeaChat": "📩 Pangea 聊天有新訊息",
"shareCourse": "分享課程",
"addCourse": "加入課程",
"joinCourseWithCode": "用代碼加入課程",
"joinPublicCourse": "加入公開課程",
"vocabLevelsDesc": "呢度會放你升級後嘅詞彙!",
"highlightVocabTooltip": "通過發送或喺聊天中練習,突出顯示以下目標詞彙",
@ -12897,10 +12896,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11773,7 +11773,6 @@
"newMessageInPangeaChat": "📩 Pangea 聊天中有新消息",
"shareCourse": "分享课程",
"addCourse": "添加课程",
"joinCourseWithCode": "用代码加入课程",
"joinPublicCourse": "加入公共课程",
"vocabLevelsDesc": "这是你提升词汇等级后,词汇将会显示的地方!",
"highlightVocabTooltip": "通过在聊天中发送或练习,将目标词汇高亮显示",
@ -11797,10 +11796,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -11780,7 +11780,6 @@
"newMessageInPangeaChat": "📩 Pangea 聊天中有新訊息",
"shareCourse": "分享課程",
"addCourse": "添加課程",
"joinCourseWithCode": "用代碼加入課程",
"joinPublicCourse": "加入公開課程",
"vocabLevelsDesc": "這是你升級後詞彙將會放置的地方!",
"highlightVocabTooltip": "通過在聊天中發送或練習來突出顯示下面的目標詞彙",
@ -11804,10 +11803,6 @@
"type": "String",
"placeholders": {}
},
"@joinCourseWithCode": {
"type": "String",
"placeholders": {}
},
"@joinPublicCourse": {
"type": "String",
"placeholders": {}

View file

@ -165,7 +165,7 @@ class Message extends StatelessWidget {
final ownMessage = event.senderId == client.userID;
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
var color = theme.colorScheme.surfaceContainerHigh;
var color = theme.colorScheme.surfaceContainerHighest;
final displayTime = event.type == EventTypes.RoomCreate ||
nextEvent == null ||
!event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
@ -569,6 +569,7 @@ class Message extends StatelessWidget {
cursor:
SystemMouseCursors.click,
child: PressableButton(
buttonHeight: 5,
triggerAnimation: controller
.showToolbarStream
.stream

View file

@ -5,43 +5,80 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
import 'package:fluffychat/utils/localized_exception_extension.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';
import '../../common/utils/error_handler.dart';
Future<void> showInviteDialog(Room room, BuildContext context) async {
if (room.membership != Membership.invite) return;
final acceptInvite = await showOkCancelAlertDialog(
context: context,
title: L10n.of(context).youreInvited,
message: room.isSpace
? L10n.of(context).invitedToSpace(room.name, room.creatorId ?? "???")
: L10n.of(context).invitedToChat(room.name, room.creatorId ?? "???"),
okLabel: L10n.of(context).accept,
cancelLabel: L10n.of(context).decline,
);
final resp = await showFutureLoadingDialog(
final theme = Theme.of(context);
final action = await showAdaptiveDialog<CourseInviteAction>(
barrierDismissible: true,
context: context,
builder: (context) => AlertDialog.adaptive(
title: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256),
child: Center(
child: Text(
L10n.of(context).youreInvited,
textAlign: TextAlign.center,
),
),
),
content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 256, maxHeight: 256),
child: Text(
room.isSpace
? L10n.of(context)
.invitedToSpace(room.name, room.creatorId ?? "???")
: L10n.of(context)
.invitedToChat(room.name, room.creatorId ?? "???"),
textAlign: TextAlign.center,
),
),
actions: [
AdaptiveDialogAction(
onPressed: () =>
Navigator.of(context).pop(CourseInviteAction.decline),
bigButtons: true,
child: Text(
L10n.of(context).decline,
style: TextStyle(color: theme.colorScheme.error),
),
),
AdaptiveDialogAction(
onPressed: () => Navigator.of(context).pop(CourseInviteAction.accept),
bigButtons: true,
child: Text(L10n.of(context).accept),
),
],
),
);
switch (action) {
case null:
return;
case CourseInviteAction.accept:
break;
case CourseInviteAction.decline:
await room.leave();
return;
}
final joinResult = await showFutureLoadingDialog(
context: context,
future: () async {
if (acceptInvite == OkCancelResult.ok) {
await room.join();
context.go(
room.isSpace
? "/rooms/spaces/${room.id}/details"
: "/rooms/${room.id}",
);
return room.id;
} else if (acceptInvite == OkCancelResult.cancel) {
await room.leave();
}
await room.join();
},
exceptionContext: ExceptionContext.joinRoom,
);
if (joinResult.error != null) return;
if (!resp.isError && resp.result is String) {
context.go("/rooms/spaces/${resp.result}/details");
}
context.go(
room.isSpace ? "/rooms/spaces/${room.id}/details" : "/rooms/${room.id}",
);
}
// ignore: curly_braces_in_flow_control_structures
@ -100,3 +137,5 @@ void chatListHandleSpaceTap(
break;
}
}
enum CourseInviteAction { accept, decline }

View file

@ -402,7 +402,11 @@ class PangeaInvitationSelectionController
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(L10n.of(context).contactHasBeenInvitedToTheChat),
content: Text(
room.isSpace
? L10n.of(context).contactHasBeenInvitedToTheCourse
: L10n.of(context).contactHasBeenInvitedToTheChat,
),
),
);
}

View file

@ -74,7 +74,7 @@ class AddCoursePage extends StatelessWidget {
),
Flexible(
child: Text(
L10n.of(context).joinCourseWithCode,
L10n.of(context).joinWithCode,
textAlign: TextAlign.center,
),
),

View file

@ -5,7 +5,6 @@ import 'package:go_router/go_router.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/common/widgets/pangea_logo_svg.dart';
import 'package:fluffychat/pangea/login/pages/add_course_page.dart';
import 'package:fluffychat/widgets/matrix.dart';
@ -59,22 +58,7 @@ class CourseCodePageState extends State<CourseCodePage> {
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(
title: Row(
spacing: 10.0,
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.network(
"${AppConfig.assetsBaseURL}/${AddCoursePage.mapUnlockFileName}",
width: 24.0,
height: 24.0,
colorFilter: ColorFilter.mode(
theme.colorScheme.onSurface,
BlendMode.srcIn,
),
),
Text(L10n.of(context).joinCourseWithCode),
],
),
title: Text(L10n.of(context).joinWithCode),
),
body: SafeArea(
child: Center(
@ -87,9 +71,14 @@ class CourseCodePageState extends State<CourseCodePage> {
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
PangeaLogoSvg(
SvgPicture.network(
"${AppConfig.assetsBaseURL}/${AddCoursePage.mapUnlockFileName}",
width: 100.0,
forceColor: theme.colorScheme.onSurface,
height: 100.0,
colorFilter: ColorFilter.mode(
theme.colorScheme.onSurface,
BlendMode.srcIn,
),
),
Column(
spacing: 16.0,

View file

@ -3,10 +3,8 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:async/async.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/bot/widgets/bot_face_svg.dart';
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
@ -19,7 +17,6 @@ import 'package:fluffychat/pangea/course_plans/courses/course_plan_model.dart';
import 'package:fluffychat/pangea/course_plans/courses/course_plans_repo.dart';
import 'package:fluffychat/pangea/course_plans/courses/get_localized_courses_response.dart';
import 'package:fluffychat/pangea/learning_settings/models/language_model.dart';
import 'package:fluffychat/pangea/login/pages/add_course_page.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
@ -183,25 +180,10 @@ class NewCoursePageState extends State<NewCoursePage> {
final spaceId = widget.spaceId;
return Scaffold(
appBar: AppBar(
title: Row(
spacing: 10.0,
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.network(
"${AppConfig.assetsBaseURL}/${AddCoursePage.mapStartFileName}",
width: 24.0,
height: 24.0,
colorFilter: ColorFilter.mode(
theme.colorScheme.onSurface,
BlendMode.srcIn,
),
),
Text(
spaceId != null
? L10n.of(context).addCoursePlan
: L10n.of(context).startOwn,
),
],
title: Text(
spaceId != null
? L10n.of(context).addCoursePlan
: L10n.of(context).startOwn,
),
),
body: SafeArea(

View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart';
@ -150,15 +149,8 @@ class PublicCoursesPageState extends State<PublicCoursesPage> {
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(
title: Row(
spacing: 10.0,
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Symbols.map_search,
),
Text(L10n.of(context).joinPublicCourse),
],
title: Text(
L10n.of(context).joinPublicCourse,
),
),
body: SafeArea(

View file

@ -105,8 +105,7 @@ class OverlayMessage extends StatelessWidget {
ownMessage && previousEventSameSender ? hardCorner : roundedCorner,
);
// ignore: deprecated_member_use
var color = theme.colorScheme.surfaceContainerHigh;
var color = theme.colorScheme.surfaceContainerHighest;
if (ownMessage) {
color = displayEvent.status.isError
? Colors.redAccent

View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:badges/badges.dart' as b;
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
@ -224,17 +225,36 @@ class SpacesNavigationRail extends StatelessWidget {
// AppConfig.borderRadius / 2,
// ),
// ),
icon: ClipPath(
clipper: MapClipper(),
child: Avatar(
mxContent: rootSpaces[i].avatar,
name: displayname,
border: BorderSide(
width: 1,
color: Theme.of(context).dividerColor,
icon: b.Badge(
showBadge:
rootSpaces[i].membership == Membership.invite,
badgeStyle: b.BadgeStyle(
badgeColor: Theme.of(context).colorScheme.error,
elevation: 4,
borderSide: BorderSide.none,
padding: const EdgeInsetsGeometry.all(0),
),
badgeContent: Icon(
Icons.error_outline,
color: Theme.of(context).colorScheme.onPrimary,
size: 16,
),
position: b.BadgePosition.topEnd(
top: -5,
end: -7,
),
child: ClipPath(
clipper: MapClipper(),
child: Avatar(
mxContent: rootSpaces[i].avatar,
name: displayname,
border: BorderSide(
width: 1,
color: Theme.of(context).dividerColor,
),
borderRadius: BorderRadius.circular(0),
size: width - (isColumnMode ? 32.0 : 24.0),
),
borderRadius: BorderRadius.circular(0),
size: width - (isColumnMode ? 32.0 : 24.0),
),
),
// Pangea#