Commit Graph

4767 Commits (7beb14dfafe1b65d0178e3669cb30bb48e0b1490)

Author SHA1 Message Date
ggurdin 9dfece83ee
tweaks for logic for showing message click instructions when the user sees the first message 1 year ago
ggurdin 3e92c46328
added arguement to showOverlay to determine is backdrop is blurred 1 year ago
WilsonLe af9ffe79d7 fix multiple empty chat 1 year ago
ggurdin 9321e024e7
cache number of completed activities 1 year ago
ggurdin ed72abb38b
clear selected messages when showing paywall 1 year ago
ggurdin 4b2c5bc213
remove unused commented out code 1 year ago
ggurdin 50c8828dd6
use activity model instead of activity events 1 year ago
ggurdin 7c8f2c0537
Merge branch 'main' into remove-records 1 year ago
ggurdin 2fb6b2231b
Merge branch 'main' into overlay-reactions 1 year ago
ggurdin f125ed6fd8
rebuild overlay on reaction event 1 year ago
William Jordan-Cooley 1bd244011f remove use of record 1 year ago
William Jordan-Cooley 9680662c1b client will pass time of req to remove possibility of different times there 1 year ago
ggurdin 99fc3fd625
Added message reactions widget to toolbar overlay 1 year ago
ggurdin ba62e0e54c
Merge branch 'main' into scrollable-overlay-message 1 year ago
ggurdin 21226ca516
don't adjust overlay message height if there's enough space to accomodate it 1 year ago
ggurdin a6f95355d1
Merge branch 'main' into scrollable-overlay-message 1 year ago
ggurdin e80cecd0f2
removed print statements 1 year ago
ggurdin 945e82d3b9
make overlay message scrollable if entire overlay doesn't fit in screen 1 year ago
ggurdin f20aaa70d5
cast score as int before sending to the server 1 year ago
William Jordan-Cooley 5b4bcb5acc additional logic to showing of it inline tooltip 1 year ago
ggurdin ae0a8254de
set height of overlay message, dismiss overlay on inkwell tap 1 year ago
ggurdin 25b62b50b5
Merge branch 'main' into 688-difficult-to-click-on-a-an-audio-message-for-feedback 1 year ago
ggurdin ca3cd03664
blur background during IT 1 year ago
ggurdin ef8c677681
removed pangea comment in overlay message file, made toolbar button height into variable for consistency in height adjustments 1 year ago
ggurdin 5540efc818
fixes for overlay message positioning, moved toolbar buttons underneath overlay message 1 year ago
William Jordan-Cooley cd9792fb1e get new tokens in representation if they don't match text 1 year ago
ggurdin 879a52c81f
responded to comment from Will in client code, added fix for mini analytics view level display 1 year ago
ggurdin a4ced9ab65
fix .env file path in main.dart 1 year ago
William Jordan-Cooley 1849178da9 ui tweaks for subscribe card and audio card 1 year ago
William Jordan-Cooley 240b039ae7 several toolbar UI tweaks 1 year ago
wcjord b7ab6038ac
further toolbar tweaks
* remove print statement

* ending animation, savoring joy, properly adding xp in session

* forgot to switch env again...

* increment version number

* about to move toolbar buttons up to level of overlay controller

* added ability to give feedback and get new activity

* more practice tweaks and instructions too

* incrementing pubspec version
1 year ago
wcjord b8edf595ca
Toolbar practice (#707)
* remove print statement

* ending animation, savoring joy, properly adding xp in session

* forgot to switch env again...

* increment version number

* about to move toolbar buttons up to level of overlay controller

* added ability to give feedback and get new activity
1 year ago
wcjord 371d4f06d4
Update main.dart
Fixing env definition... again....
1 year ago
wcjord 51e8c4b7ce
Toolbar practice (#704)
* remove print statement

* ending animation, savoring joy, properly adding xp in session
1 year ago
wcjord 08a7c74b4a
remove print statement (#703) 1 year ago
William Jordan-Cooley f9ad45d203 intelligently choosing tokens and passing all their info 1 year ago
William Jordan-Cooley 8bffe17455 passing practice model instead of activity? 1 year ago
William Jordan-Cooley 26752a9ba7 change back to regular .env 1 year ago
William Jordan-Cooley f589d2371b exit practice if no activities to do 1 year ago
William Jordan-Cooley 7c61ee7026 dang wrong .env 1 year ago
wcjord a1f9e6a243
Toolbar practice (#702)
* drafting toolbar with practice

* moved some code around

* turning overlay message content into text buttons for selection, updated toolbar buttons progress bar

* activities displaying and forwarding toolbar

* experimenting with using choice value rather than index for logic

* reimplementation of wordnet results and translation for individual words

* cache and timer

* mostly done with activities in toolbar flow

---------

Co-authored-by: ggurdin <ggurdin@gmail.com>
Co-authored-by: choreo development <williamjordan-cooley@Williams-MacBook-Pro-3.local>
1 year ago
Wilson bbe7ca7f4c
Merge branch 'main' into 689-fix-bot-dialog-kicks-the-bot-undesirably 1 year ago
choreo development 9cc96580d7 made toolbar visible when clicking in transparent msg row 1 year ago
choreo development 25a8769132 turned off showUseType feature 1 year ago
WilsonLe 6c792e3f23 fix bot dialog confirm kicks the bot undesirably 1 year ago
ggurdin 0984df4167
fixed height of toolbar 1 year ago
ggurdin a40c86a148
added header height to overflow calculations when scrolling overlay to midpoint of screen 1 year ago
ggurdin 39396aba23
removed duplicate 'new space' option in main menu 1 year ago
ggurdin 3a7d46fc18
add blue effect to overlat background, made toolbar backdrop slightly darker 1 year ago
ggurdin 2262bf6e04
Merge branch 'merge' into merge-analytics 1 year ago
ggurdin 11266f88bb
Merge branch 'main' into merge 1 year ago
ggurdin 4e8000eb9d
Handle case of language level not being int in bot-options state event 1 year ago
ggurdin f7fdffaaa4
disable suggestions in input bar 1 year ago
ggurdin 78214b7433
removed clearing of errorService in it_controller clear function - this was causing errors that happened on send to not be shown 1 year ago
ggurdin 397f32fcbc
don't show toolbar is message is redacted 1 year ago
ggurdin 0124ce6d24
Merge branch 'merge' into merge-analytics 1 year ago
ggurdin 2001e51171
Merge branch 'main' into merge 1 year ago
ggurdin 8637033499
Merge branch 'main' into restrict-toolbar-msg-types 1 year ago
ggurdin bd25cda630
only show toolbar if the message is text or audio 1 year ago
ggurdin 2ff70e65db
if, by shifting up a message to make footer space, a header overflow is caused, opt of push the message down instead of up 1 year ago
ggurdin e8275adbc6
Merge branch 'merge' into merge-analytics 1 year ago
ggurdin f3d32fa7ef
Merge branch 'main' into merge 1 year ago
ggurdin 410fb80b35
Merge branch 'main' into message-toolbar-improvements 1 year ago
ggurdin 36537b0dc7
scroll to center of screen if toolbar causes header overflow, scroll the overlay up if there's a footer overflow 1 year ago
ggurdin 2e139be658
position message overlay directly over the underlying message 1 year ago
ggurdin fbd8d63c46
merge merge branch into merge-analytics branch 1 year ago
ggurdin 10c26d3a7e
merge main into merge branch 1 year ago
ggurdin a32eb15df7
updated capacity copy to correspond with room type (chat or space) 1 year ago
ggurdin b63ae8c43d
updated copy to always call chat 'chats' (insteads of groups) 1 year ago
ggurdin 52dfc47333
Merge branch 'merge' into merge-analytics 1 year ago
ggurdin f193a4d12a
Merge branch 'main' into merge 1 year ago
ggurdin db9320d2ac
removed _repLocal function causing delays in initial translation, also made selection translation and repEvent fetching futures happen at the same time in message translation card 1 year ago
ggurdin 38a5a7197a
Merge branch 'learning-analytics-summary' into merge-analytics 1 year ago
ggurdin c2466f7aec
added 'no data' warning to analytics popup if there's no data 1 year ago
ggurdin 3a31e28838
decreased font size of level indicator 1 year ago
ggurdin c5ccf6dac2
merge analytics updates into fluffychat merge branch 1 year ago
ggurdin 25b0e09123
Merge branch 'main' into learning-analytics-summary 1 year ago
ggurdin f15acbd872
merge main and update matrix dart SDK 1 year ago
ggurdin 04db40f7ea
default true for auto-igc setting 1 year ago
ggurdin f9f0945655
speed up toolbar on click message 1 year ago
ggurdin f016d6e24b
when adding a room to a space via the chat list item popup, remove it from any other parent spaces it was previously in 1 year ago
ggurdin 6687889d58
added learning analytics view to chat list appbar 1 year ago
ggurdin 85429e4bc8
Merge branch 'main' into learning-analytics-summary 1 year ago
ggurdin be19175da5
give main menu button a background 1 year ago
ggurdin 1df329d924
filter out lemmas with saveVocab set to false 1 year ago
ggurdin 790223e68c
added popup for analytics indicators to show xp per lemma 1 year ago
ggurdin 0265019284
added 'categories' field to construct use model and started saving morph category 1 year ago
ggurdin 10c0cfef2a
changed homeserver picker view / functionality back to previous setup 1 year ago
ggurdin 9eb40e2b21
removed duplicate emoji picker widgets and fixed name of variable in chat controller to resolve late initialization error when sending an emoji reaction 1 year ago
ggurdin 23a8e1f7ea
removes testing print statements 1 year ago
ggurdin 8605202c63
added back 'remove from space' option in chat list item dropdown 1 year ago
ggurdin af83ea1212
only go to space details on navigate to space if in column mode 1 year ago
ggurdin 5461813352
when navigating to space, go to the space details page 1 year ago
ggurdin 4a252729ff
updated space view to auto-reload on space child update 1 year ago
ggurdin 85b501e180
re-enabled code related to recent updates to matrix SDK 1 year ago
ggurdin c91391b274
fluffychat merge - resolve conflicts 1 year ago
ggurdin c11c9cb28b
fluffychat merge - resolve conflicts 1 year ago
ggurdin c58226807a
fluffychat merge - resolve conflicts 1 year ago
ggurdin 5e347144aa
fluffychat merge - resolve conflicts 1 year ago
ggurdin eabd5b10ae
re-enable recording on web 1 year ago
ggurdin 03da94ff41
fluffychat merge - resolve conflicts 1 year ago
ggurdin 1b03644380
fluffychat merge - resolve conflicts 1 year ago
ggurdin 8b20cce186
Merge commit 'd0e1e0229c2d6b8c00e3278d71651003614e38d2' into merge 1 year ago
ggurdin 6a83249236
fluffychat merge - resolve conflicts 1 year ago
ggurdin 346cd1ab5f
fluffychat merge - resolve conflicts 1 year ago
ggurdin 31412c2a13
fluffychat merge - resolve conflicts 1 year ago
ggurdin 7bf3a9ab94
fluffychat merge - resolve conflicts 1 year ago
ggurdin 4fccd5fed0
fluffychat merge - resolve conflicts 1 year ago
ggurdin 9efe214b6d
Merge commit '83490de6fd967ba8545d5960c0a6cebd410e0580' into merge 1 year ago
ggurdin cca5bb382f
fluffychat merge - resolve conflicts 1 year ago
ggurdin 2a710841a6
fluffychat merge - resolve conflicts 1 year ago
ggurdin 82fa80160f
fluffychat merge - resolve conflicts 1 year ago
ggurdin 4b15b8fab4
fluffychat merge - resolve conflicts 1 year ago
ggurdin 492a3d5095
Merge commit '0bf387da14c562eae21b36897a53a300ea5b6717' into merge 1 year ago
ggurdin 5ea202062c
fluffychat merge - resolve conflicts 1 year ago
ggurdin 40768f9859
fluffychat merge - resolve conflicts 1 year ago
ggurdin 5e59a3168a
fluffychat merge - resolve conflicts 1 year ago
ggurdin ebc4a88d4e
fluffychat merge - resolve conflicts 1 year ago
ggurdin 816fe43d3e
fluffychat merge - resolve conflicts 1 year ago
ggurdin deb2e655d6
fluffychat merge - resolve conflicts 1 year ago
ggurdin e80e3ba1b8
Merge branch 'main' into learning-analytics-summary 1 year ago
ggurdin 03e04ee752
improved text selection handling, added text selection handling for HTML messages, clear selection on close overlay 1 year ago
ggurdin bb0a499654
Merge branch 'main' into html-message-toolbar 1 year ago
ggurdin 2e597a55a2
merge main into learning analytics and resolve conflicts 1 year ago
ggurdin 4fe9b05c89
upgrade to the most recent version of our fork of the matrix sdk 1 year ago
ggurdin 11627c2bfb
enable toolbar on click for html messages 1 year ago
ggurdin 660c49873b
removed expanded widget wrapping overlay stack that caused crash in release mode 1 year ago
ggurdin 5e145837d2
add padding to reaction picker 1 year ago
ggurdin a1ee965b9e
account for chat details column showing in message overlay 1 year ago
Krille-chan 6bdeba7cd7
Merge pull request #1269 from selfisekai/flutter-3.24
chore: upgrade flutter to 3.24
1 year ago
ggurdin 57b1ef04ef
Merge branch 'main' into learning-analytics-summary 1 year ago
ggurdin 9f641633e4
merge main branch into combined selection view branch 1 year ago
ggurdin 14ba8bf47b
merge main into analytics branch 1 year ago
William Jordan-Cooley 381769a6e4
adding user id to igc request 1 year ago
ggurdin cace965456
wrap chat input row in stateful widget and rebuild on choreo update to keep hint text and send button up-to-date 1 year ago
ggurdin 5c7a1f554b
added tooltip toggle status to matrix profile to prevent showing again after it's been dismissed 1 year ago
ggurdin 104750732b
made inline tooltip take up only one line, sped up animation when closing inline tooltip 1 year ago
Kelrap 8a947e83d9
Adds inline tooltip to IT bar 1 year ago
William Jordan-Cooley 41ce213553
show feedback in user l1 1 year ago
ggurdin b5abef7d1a
moved previous message function to igc controller 1 year ago
Kelrap 54d63b1a4f
Fix audio errors 1 year ago
Kelrap 34d02bb95c
Remove prev message from span 1 year ago
Kelrap 4f924656e0
Fix minor error 1 year ago
Kelrap 2ca6d102aa
Add json methods to PreviousMessage 1 year ago
Kelrap 55d75efa06
Forgot to save earlier 1 year ago
Kelrap 61d20f8b37
Add prevMessages to more places 1 year ago
Kelrap 20ffe7ba37
Pass previous X messages to IGC 1 year ago
Kelrap 291dcfc192
Toolbar can show downward 1 year ago
Kelrap 87255ecdc0
Fix mention suggestion overflow 1 year ago
Kelrap 9d0bf230e1
Re-add mention functionality 1 year ago
ggurdin 5f3326b843
cleaned up message.dart 1 year ago
ggurdin 6976c0575d
removed unused overlay position options and renamed OverlayEnum to OverlayPositionEnum 1 year ago
Krille e6948ee0b4
chore: Follow up add web notification icons with auth media 1 year ago
Krille 3cb88f3d49
chore: Follow up login page 1 year ago
ggurdin bf29a324e4
removed unnecessary pangea comments 1 year ago
ggurdin db21eaac7a
check if igc button is mounted before settings state 1 year ago
ggurdin a181ace577
select message on showToolbar and ensure message is deselected on dismiss 1 year ago
ggurdin c5db829fb5
resolved merge conflicts 1 year ago
ggurdin 0373d01f1b
simplified positioning of toolbar 1 year ago
krille-chan eae7db7d71
chore: Follow up set read marker logic 1 year ago
Krille aa3de2816b
chore: Follow up design textfields 1 year ago
krille-chan 0f16cdee88
chore: Better scroll up 1 year ago
krille-chan e2538816a3
chore: Follow up homeserver picker page 1 year ago
Krille-chan 53b8b5290e
Merge pull request #1291 from krille-chan/krille/use-auth-media
feat: Use matrix authenticated media
1 year ago
Krille 158a6855c3
feat: Use matrix authenticated media 1 year ago
krille-chan dec588d0c0
refactor: Simplify login UX 1 year ago
krille-chan f17b09f56c
chore: Follow up set read marker 1 year ago
krille-chan 75800ccdd5
chore: Follow up send file dialog fix 1 year ago
ggurdin 6d4efea322
clear out analytics stream on dispose to prevent carry over across login sessions 1 year ago
ggurdin 3ce03ecc2f
adjust position of points gain animation over new messages 1 year ago
ggurdin c9cdba8a34
Merge branch 'main' into add-localization 1 year ago
ggurdin abb1e3a56f
added missing matrix localization for invitedBy 1 year ago
ggurdin e6f90af011
added potential fix and better logging for flutter_secure_storage returning null for database cipher on iOS 1 year ago
ggurdin 14783d8536
Revert "Story game" 1 year ago
ggurdin a49105d298
Revert "moved timer sync logic to seperate function, don't hide bot messages …" 1 year ago
ggurdin 77fb4bcf4e
Revert "base timer off of game state event" 1 year ago
ggurdin f8020279c6
Merge branch 'main' into learning-analytics-summary 1 year ago
ggurdin 54040d841a
add draft construct uses while using language assistance, added morphs to learning progress indicators 1 year ago
ggurdin 868e83709d
removed some excessive file changes to simplify PR 1 year ago
Kelrap 13dff2bd1d Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection 1 year ago
Kelrap 8e960f1b43 Make entirety of overlay message box scrollable 1 year ago
ggurdin 75234e6a6f
inital work for having a 2-stage progress bar and saving draft analytics locally 1 year ago
ggurdin 7f731e1406
base timer off of game state event 1 year ago
Kelrap c99094f547 Fix window resize selection issue 1 year ago
Kelrap d79e78271c Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection 1 year ago
ggurdin e8bb166fae
moved timer sync logic to seperate function, don't hide bot messages after end of round 1 year ago
ggurdin f4a0fbaacb
Revert "Revert "don't show user avatars or display names in chats""
This reverts commit 07fa96cdc9.
1 year ago
ggurdin 012b20b09f
some small tweaks 1 year ago
Kelrap 72a6f30227 Timer does not automatically start 1 year ago
ggurdin fa36eb605c
improved listening for bot messages 1 year ago
Kelrap d2bcdaa7db Add timer to round model 1 year ago
Kelrap 1a841d382f Add getter for remaining time 1 year ago
Kelrap e7f3b9e73a Adds countdown timer to chat 1 year ago
ggurdin 2b574f42c1
added completer and recursive function to start a new round at the end of a round 1 year ago
ggurdin ac6ddc6d0e
added logic for auto-starting round on bot message 1 year ago
ggurdin ea1c1a6840
added prototype of GameRound model 1 year ago
ggurdin 07fa96cdc9
Revert "don't show user avatars or display names in chats"
This reverts commit a36c52ff87.
1 year ago
Kelrap 6c5f4d0ece Try fix window resize problem 1 year ago
krille-chan 2615632881
chore: Remove emoji proposals feature 1 year ago
ggurdin a36c52ff87
don't show user avatars or display names in chats 1 year ago
Kelrap e7fa9a35f1 Adjust scrolling logic 1 year ago
Kelrap ec7ecc3069 Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection 1 year ago
Krille 8784acc7e6
chore: Disable record on web 1 year ago
Krille-chan 9c6e2a1df6
Merge pull request #1224 from dlyrsk/main
Fix web base url and privacy url configuration processing (Recreated)
1 year ago
krille-chan ebd8b700b1
chore: Show short forms of months and week days in UI 1 year ago
krille-chan 612711d602
chore: Follow up no more chats found label 1 year ago
krille-chan 664548d937
chore: Nicer empty chat list placeholder 1 year ago
krille-chan 1c6d8a0579
chore: Make VOIP plugin less noisy in logs 1 year ago
krille-chan d3298f0b09
chore: Follow up display read marker in timeline 1 year ago
krille-chan d0e1e0229c
chore: Follow up linter fix 1 year ago
Krille 89309ca15e
chore: Follow up chatlist design 1 year ago
Kelrap a417f2f8ca Add scrolling to center messages 1 year ago
Kelrap 6acf829fe2 Emoji picker adjustments 1 year ago
Kelrap baa2e17aad Revert emoji picker close button 1 year ago
Kelrap c42f44a798 Programmatically determine left/right 1 year ago
Krille-chan 9731fb461a
Merge pull request #1261 from CodeThomnics/refactor/reduce_context_calls_theme
Refactor: Reduce .of(context) calls theme
1 year ago
lauren n. liberda 55196e7c9d
chore: upgrade flutter to 3.24 1 year ago
Krille 02430a952d
build: Update to Matrix SDK 0.32.0 1 year ago
Kelrap ecb1df70dc Add explanation for reaction picker logic 1 year ago
Kelrap c27c250590 Removes error button padding 1 year ago
Kelrap ea8e4497f3 Close keyboard if open 1 year ago
Kelrap 43d99c526a Tweaks 1 year ago
Krille 84075133fa
chore: Bring back add to space feature 1 year ago
Krille 641343d5fe
chore: Follow up scroll to event id fix 1 year ago
Kelrap ed57c340d1 Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection 1 year ago
Kelrap f46a5bac7f Shift footer down 1 year ago
Kelrap bb263c71c2 Toolbar placed over selected message 1 year ago
ggurdin f5c81fe8ec
merge main, resolve conflicts 1 year ago
ggurdin b8bd90a44d
replace accessToken with matrix access token 1 year ago
ggurdin 3f7c154d2e
Merge branch 'main' into 559-role-play-mode 1 year ago
WilsonLe c193c928a1 implement dynamic zone label and title shared component 1 year ago
WilsonLe 49921e47e4 Merge branch '559-role-play-mode' of https://github.com/pangeachat/client into 559-role-play-mode 1 year ago
WilsonLe 62d71285a4 fix text adventure title padding 1 year ago
ggurdin 500e54bed9
Merge branch 'main' into 512-bump-matrix-sdk 1 year ago
ggurdin 04012481fa
Merge branch 'main' into 559-role-play-mode 1 year ago
dlyrsk c277e73faf
Merge branch 'krille-chan:main' into main 1 year ago
ggurdin 7165060041
choreographer pulls roomID from chat so input bar key does not change after setting choreo roomID, resolving issues with input bar auto-focus 1 year ago
ggurdin cc310acf99
don't animate level bar unless XP points have changed 1 year ago
Kelrap 959172fcfe Hide public profile toggle in learning settings 1 year ago
WilsonLe adb5d3eb39 Merge branch '546-improve-bot-settings-ui' into 559-role-play-mode 1 year ago
WilsonLe 1ece90dad2 refactor, group create group and chat details into one component 1 year ago
ggurdin 15c2d1dfd9
added analytics view to space view, removed number ticker animation 1 year ago
Kelrap a911b9f852 Attempt 1 of repositioning toolbar 1 year ago
WilsonLe bd4d9e43ed add create group chat validation for custom and game master instructions 1 year ago
ggurdin 7dc8a72f46
Merge branch 'main' into 547-improve-bot-settings-ui 1 year ago
ggurdin 4278f7b196
get analytics events directly from server, cache last update time for user's l2 1 year ago
Kelrap 4b80871922 Fix edit overflow 1 year ago
Kelrap abe98390f1 Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection 1 year ago
Kelrap f68e8f586d Merge branch 'toolbar-selection' of https://github.com/pangeachat/client into toolbar-selection 1 year ago
Kelrap 19b20efc53 PR edits, minus positioning changes 1 year ago