Merge prod into main #2040
Merged
Merge prod into main #2040
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ggurdin
added a commit
that referenced
this pull request
Mar 5, 2025
* feat: grammar analytics popup redesign (#1670) * fix: revert change to how unread notification count is calculated (#1671) * fix: revert some changes to leaving space logic, updated copy (#1677) * feat: add github action to add needs testing labels to closed issues (#1678) * 1653 GitHub action to add needs testing labels (#1679) * feat: add github action to add needs testing labels to closed issues * fix: add all needs testing labels * fix: resolve overflow for long lemmas (#1680) * 1512 level up notification (#1570) * feat: initial work for level up notification * feat: initial animation * feat: level up slide animation, wait for image data to load * feat: trigger animation on level up * feat: added sound to level up notificaton * fix(class_code): class code was not getting context * Morph-repo-2 (#1681) * feat(morphs): repo for getting lang-specific list of morphs * integrated repo into use of morph features and tags * generated * merged with previous push * generated * generated * chore: fix .env file path --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> Co-authored-by: ggurdin <[email protected]> * 1655-hide-rooms-filters-with-7-rooms (#1656) * ui(chat_list_body): hide filters if < 7 rooms * generated --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * Fluffychat merge (#1685) chore: Merge upstream changes --------- Signed-off-by: Krille <[email protected]> Co-authored-by: krille-chan <[email protected]> Co-authored-by: Krille <[email protected]> Co-authored-by: Linerly <[email protected]> Co-authored-by: Priit Jõerüüt <[email protected]> Co-authored-by: 大王叫我来巡山 <[email protected]> Co-authored-by: fadelkon <[email protected]> Co-authored-by: Aindriú Mac Giolla Eoin <[email protected]> Co-authored-by: Edgars Andersons <[email protected]> Co-authored-by: josé m <[email protected]> Co-authored-by: Bezruchenko Simon <[email protected]> Co-authored-by: Christian <[email protected]> Co-authored-by: - <[email protected]> Co-authored-by: Angelo Schirinzi <[email protected]> Co-authored-by: xabirequejo <[email protected]> Co-authored-by: Piotr Orzechowski <[email protected]> Co-authored-by: Rex_sa <[email protected]> Co-authored-by: Tewuzij <[email protected]> Co-authored-by: goknarbahceli <[email protected]> Co-authored-by: தமிழ்நேரம் <[email protected]> Co-authored-by: Erin <[email protected]> Co-authored-by: EpicKiwi <[email protected]> Co-authored-by: Christian Tietze <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * feat: don't award analytics data for messages not in l2 (#1686) * feat: trim username and password fields before login (#1687) * feat(morph_analytics_view): show all morph icons if support account * feat: allow users to edit lemmas (#1694) * feat: move language dropdowns into learning settings dialog (#1695) * feat: use onInitStateChanged in login function to redirect to chat view quicker (#1696) * feat: bring back share link to join spaces (#1701) * fix: added linkify to message token text widget (#1702) * chore: update reply and link text styling (#1708) * fix: reenable token clicking after adding linkify spans (#1711) * chore: update link text color in dark mode (#1716) * feat: add submit button to learning settings popup (#1717) * 1547 level indicator for all users (#1722) * feat: publicly viewable target language and level indicator --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add message meaning challenge activity (#1706) * Add message meaning mode to toolbar --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> Co-authored-by: ggurdin <[email protected]> * Vi-copy (#1724) * complete all vi translations * fix typo * fix: override text field's default error styling to remove gap but still show error outline on username field (#1726) * 1689-make-separate-room-extensions (#1727) * fix(room extensions): Made first use of room extensions the original definition --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * feat: added XP offset data to public profile to prevent user from ever going down a level (#1731) * fix: unfocus keyboard on click outside in activity planner page, add done button to final text field (#1732) * feat: move reply button to chat view header (#1733) * fix: replace web preview icons (#1746) * fix: add back password reset button (#1747) * feat: update country dropdown to match style of language dropdown (#1756) * chore: add missing grammar copy (#1762) * allow user to simply search for username without prefix and suffix (#1761) * allow user to simply search for username without prefix and suffix * remove debug print * generated --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * fix: remove expanded widget from country tile (#1765) * fix: resolve memory leak on iOS caused by theme data (#1768) * chore: update vocab copy (#1770) * Unborked locales (#1741) * feat: localized languages --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> Co-authored-by: ggurdin <[email protected]> * chore: reduce padding in learning setting dropdowns (#1772) * chore: updated input bar copy (#1774) * 1719 grammar detailed view in analytics (#1728) * feat: grammar analytics details page --------- Co-authored-by: wcjord <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: update out-of-date language cache (#1775) * Remove routes that can lead to space chats (#1757) * Use push instead of go when traversing spaces * Redirects from space chat page --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * fix: dispose TextPainter after use (#1777) * fix: combine token with following punctuation to prevent punctuation from causing newline (#1783) * fix: make learning settings dropdowns stand out against background (#1784) * fix: remove analytics from memory on logout (#1786) * feat: use custom vocab and morph icons (#1787) * Copies for all (#1780) * initial script * copies for all! * revert intl files * mistaken en to vi translation * improve translation * add vi translation, fix trnaalste script to respect existing metdata * revert translation files * fix translation to only add more without changing too much existing translations --------- Co-authored-by: ggurdin <[email protected]> * Revert "Copies for all (#1780)" (#1788) This reverts commit 76f6222. * feat: maintain scroll position in vocab/morph analytics view (#1791) * feat: custom sort order for morph features (#1794) * fix: if example message contains multiple of the same lemma, bold each of them instead of showing as seperate messages (#1795) * fix: update morph feature sort order (#1796) * make word meaning activity refetch new definition if cache expires (#1779) * make word meaning activity refetch new definition if cache expires * generated * bake expire at into response json * generated * add expire at in to and from json method --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * feat: only show window of tokens surrounding highlighted words in lemma use examples messages (#1811) * fix: when merging punctuation into tokens to prevent line breaks, account for punctuation preceding tokens (#1812) * fix: if SVG content is already cached, don't use a FutureBuilder in C… (#1816) * fix: if SVG content is already cached, don't use a FutureBuilder in CustomizedSVG * chore: fix emoji button width * choreo: lower case text before tts (#1817) * fix: more accurate splitting of tokens containing punctuation (#1822) * fix: lock app in portrait mode (#1823) * fix: go to space after clicking join even if already in the space (#1827) * fix: fix for splitting up tokens with combined punctuation (#1828) * fix: normalize space chat count copy (#1829) * refactor(morph_meaining): simplifying morph response * feat(github): GitHub production release flow (#1807) * changed to produciton push release * test version title * set to production * chore: revert updates to grammar icons in analytics summary (#1831) * fix: move shouldDoActivity function to pangeaMessageEvent to prevent giving activities for messages not in user's l2 (#1832) * fix: set profile to public by default (#1840) * Update background color in language_level_dropdown.dart and p_languag… (#1841) * Update background color in language_level_dropdown.dart and p_language_dropdown.dart --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: fix emoji rendering issues in message token text (#1842) * Fix arb types (#1848) * chore: move over all fluffychat copy changes, revert any differenced between FluffyChat and Pangea copy * chore: sort copy between FluffyChat and Pangea, update metadata types for FluffyChat copy * chore: update metadata type for pangea chat copy * chore: add placeholders to Pangea vietnamese copy * feat: fetch new tokens for messages without originalsent representations (#1853) * fix: don't allow users to have same base and target short langCode (#1854) * fix: always show display event in toolbar (#1855) * fix: dynamically update input bar height to offset event list (#1859) * 1814 add future loading dialog to prevent user interaction during signup login loading (#1866) * chore: updates for running on android for flutter 3.29.0 * feat: show future loading dialog on signup and login * chore: enable build on iOS for flutter 3.29.0 * Adds logging when redirecting from space chat (#1862) * Adds logging when redirecting from space chat * generated --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * fix: wait for bot options to be saved before closing conversation bot dialog (#1868) * fix: update base/target language on dropdown value change in activity planner (#1869) * feat: add option to go back from user settings signup page by logging out (#1870) * fix: delete selection are around input bar textfield (#1871) * Use system keyboard setting in Learning Settings (#1867) * Use system keyboard setting in Learning Settings --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * fix(pangea_token_model): don't give activities on tokens you just use… (#1856) * fix(pangea_token_model): don't give activities on tokens you just used in a message * generated * generated --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * feat: use text instead of icons for analytics buttons (#1878) * 1846 word specific audio player not working (#1882) * feat: tie TTS enabled to target lang, show warning popup when disabled * fix: prevent top overflow for popups * feat: added reusable widget to show user's public language and level, added to participant list items (#1885) * fix: add back emoji button (#1886) * fix: switch vocab / grammar buttons to use icon and text (#1888) * fix(storage optimization): Removed and replaced used of PStore with G… (#1730) * fix(storage optimization): Removed and replaced used of PStore with GetStorage --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> Co-authored-by: ggurdin <[email protected]> * 1797-improve-grammar-icon-loading (#1887) * fix(image caching): used the CachedNetworkImage for icons to stop fetching them with every rebuild * generated * update dependencies --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> * fix: don't call span_details on IT match (#1889) * 1759-get-rid-of-redundant-language-selection-error (#1799) * fix(error message): made it so the same error message does not appear twice --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <[email protected]> Co-authored-by: ggurdin <[email protected]> * fix: fetch morphs once and sort after fetching instead of using future builder in grammar analytics view (#1890) * fix: before popping in futureloadingdialog, check if canPop (#1914) * chore: revert deleting selection area in input bar (#1915) * fix: make text dialog autosubmit work as expected (#1918) * chore: in TTS, use full langCode voice if available, and short langCode voice if not (#1919) * chore: account for chat details column width in message overlay max width (#1920) * chore: make textfields in toolbar work on firefox/safari (#1922) * fix: update key in MorphFeature.fromJson function (#1925) * chore: remove filters overflow by replacing ListView with SingleChildScrollView (#1921) * Mobile stt (#1928) * chore: if user's language is not in langList, refresh langList * chore: simplify logic for setting TTS lang, set TTS lang each time speak is called * chore: move learning settings button to fix overflow in analytics summary (#1929) * chore: fix some spacing issues on small screens (#1930) * chore: if in space with knock join rule, redirect to space in public room bottom sheet (#1935) * fix: removed duplicate question in activities (#1936) * fix: enable account deletion (#1943) * chore: when choices array goes off screen, stop playing TTS (#1945) * fix: update logic for checking if short lang code TTS is available (#1946) * fix: added fix to remove matches if they don't align with tokens and to use characters when replacing originalInput (#1948) * chore: simplify enforcement of room capacity, remove capacity option for spaces (#1951) * chore: revert changes to hide chat filters for new accounts, seperate chat types by default (#1959) * chore: set enableSuggestions to enableAutocorrect (#1961) * chore: don't stop TTS after IT choice selection (#1962) * chore: update Vietnamese translations (#1964) * fix: force room settings header onto one line with ellipsis for overflow (#1965) * chore: remove analytics popup header text on mobile (#1966) * chore: update empty description copy for spaces (#1968) * chore: added timeout to room creation (#1971) * fix: when leaving space, do not leave analytics rooms (#1973) * feat: better UX for event too large error (#1975) * chore: if originalSent without tokens, edit message to add new tokens (#1976) * chore: stop audio player on showToolbar (#1979) * chore: give IT bar choices array steps unique IDs to avoid identical keys (#1980) * chore: stop audio message playing on 1) navigate to different route, 2) play other message, 3) open toolbar (#1982) * chore: after adding to stop audio stream to stop other audio messages on play another audio message, wait for stream to go through before playing so it doesn't stop the just-clicked audio (#1983) * chore: disable creation of space with empty name (#1986) * chore: link visibility (#1988) * chore: set active filter to groups after creating new group (#1990) * chore: don't show toolbar for redacted messages (#1992) * chore: clear init completer in userController on logout (#1993) * chore(level_display_name): don't display bot learning stuff (#1999) * fix(lemma_meaning_activity_generator): filter out empty strings as eligible distractors (#2004) * filter out empty strings as elible distractors * generated --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: on click of chat invite, show dialog asking user to accept or decline (#2007) * chore: update leave room messages (#2010) * chore: only run leave function if dialog result is yes (#2011) * chore: add unread room badge to unread room filter (#2014) * chore: update copy in delete account dialog (#2015) * chore: revert to fluffychat's add chat dialog (#2017) * Revert "chore: revert to fluffychat's add chat dialog (#2017)" (#2018) This reverts commit 8f8789d. * 2016 the confirm and cancel buttons not in the right place (#2019) * chore: revert to fluffychat's add chat dialog * chore: revert to fluffychat's add chat dialog * chore: show loading indicator and don't hide button on subscription page (#2023) * chore: show spaces filter if user is in any spaces (#2028) * refactor: add necessary info to subscription options * fix: prevent rendering error on page resize (#2035) * chore: try to pull localized price string from revenuecat SDK on mobile (#2038) * build: bump version number (#2039) * Merge prod into main (#2040) * fix: always pass context to classCode function * chore: bump version number (#1872) * fix: add release workflow updates to production branch (#1873) --------- Signed-off-by: Krille <[email protected]> Co-authored-by: wcjord <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: krille-chan <[email protected]> Co-authored-by: Krille <[email protected]> Co-authored-by: Linerly <[email protected]> Co-authored-by: Priit Jõerüüt <[email protected]> Co-authored-by: 大王叫我来巡山 <[email protected]> Co-authored-by: fadelkon <[email protected]> Co-authored-by: Aindriú Mac Giolla Eoin <[email protected]> Co-authored-by: Edgars Andersons <[email protected]> Co-authored-by: josé m <[email protected]> Co-authored-by: Bezruchenko Simon <[email protected]> Co-authored-by: Christian <[email protected]> Co-authored-by: - <[email protected]> Co-authored-by: Angelo Schirinzi <[email protected]> Co-authored-by: xabirequejo <[email protected]> Co-authored-by: Piotr Orzechowski <[email protected]> Co-authored-by: Rex_sa <[email protected]> Co-authored-by: Tewuzij <[email protected]> Co-authored-by: goknarbahceli <[email protected]> Co-authored-by: தமிழ்நேரம் <[email protected]> Co-authored-by: Erin <[email protected]> Co-authored-by: EpicKiwi <[email protected]> Co-authored-by: Christian Tietze <[email protected]> Co-authored-by: Wilson <[email protected]> Co-authored-by: sienna-sterling <[email protected]> Co-authored-by: Kelrap <[email protected]> Co-authored-by: Brord van Wierst <[email protected]> Co-authored-by: Sofanyas Genene <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thank you so much for your contribution to FluffyChat ❤️❤️❤️
Please make sure that your Pull Request meet the following acceptance criteria:
dart format lib/ test/anddart run import_sorter:main --no-commentsPull Request has been tested on: