Commit Graph

14300 Commits

Author SHA1 Message Date
ericdecanini a2d18d460a Fixes PollMode import error in TimelineFragment 2022-03-15 18:10:05 +01:00
ericdecanini 98b7d194eb Adds getBestX following merge from develop 2022-03-15 15:54:30 +01:00
ericdecanini 9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
2022-03-15 15:48:17 +01:00
Aris Kotsomitopoulos e0b93c2d2c
Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list
Live Threads
2022-03-15 15:14:26 +01:00
Onuray Sahin 30c325b16c
Merge pull request #5504 from vector-im/feature/ons/poll_tests
Poll Integration Tests
2022-03-15 16:51:12 +03:00
ariskotsomitopoulos 4d76c0d822 Fix build error 2022-03-15 14:34:53 +01:00
ariskotsomitopoulos 8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-03-15 14:21:04 +01:00
Onuray Sahin b4df6e1ae8 Merge branch 'develop' into feature/ons/poll_tests
* develop:
  Fix lint error.
  Fix lint error.
  Avoid stable prefix
  Support both unstable and stable prefixes.
2022-03-15 16:16:17 +03:00
Onuray Sahin 1a76914828
Merge pull request #5345 from vector-im/feature/ons/fix_unstable_prefixes
Support both unstable and stable prefixes
2022-03-15 15:16:16 +03:00
Onuray Sahin f4bdaf6151 Fix lint error. 2022-03-15 14:47:19 +03:00
Onuray Sahin dd3178c36e Merge branch 'develop' into feature/ons/poll_tests
* develop: (150 commits)
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  extracting method for the handling of the profile picture selection
  ...
2022-03-15 14:39:51 +03:00
ariskotsomitopoulos c9f07061ef Revert temporary fix for develop crash 2022-03-15 11:26:00 +01:00
Eric Decanini de14e10a45
Merge pull request #5534 from vector-im/bugfix/eric/top-space-crash
Fixes timeline crash due to additionalTopSpace
2022-03-15 09:59:09 +01:00
ClaireG 5de7873755
Merge pull request #5532 from vector-im/cgizard/ISSSUE-5514
Read receipt in wrong order
2022-03-14 17:39:30 +01:00
ericdecanini 184b35ab38 Removes changelog file 2022-03-14 17:35:34 +01:00
Claire G 6c7b4d4256 Fix PR comment 2022-03-14 17:10:58 +01:00
ariskotsomitopoulos d7c486c55e Add fallback support rendering proposed in MSC3676 2022-03-14 16:04:08 +01:00
Adam Brown 82e1afdb72
Merge pull request #5375 from vector-im/feature/adm/display-personalisation-based-on-capabilities
FTUE - Capability based personalisation flow
2022-03-14 13:34:21 +00:00
ericdecanini 3981e72301 Adds changelog file 2022-03-14 14:21:01 +01:00
Maxime NATUREL 4939a98689
Merge pull request #5181 from vector-im/feature/mna/4533-dm-rooms-headers
#4533:  improve headers UI in room/messages lists
2022-03-14 13:51:03 +01:00
ericdecanini d35c1e833d Refactors MessageBubbleView 2022-03-14 13:05:35 +01:00
Adam Brown c06d3ff809 Updating changelog copy
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-03-14 11:54:42 +00:00
Adam Brown c84ce5a2e0 making use of the fake overrides for testing 2022-03-14 11:54:42 +00:00
Adam Brown c2fe669670 extracting the personalization complete emitting to a dedicated function 2022-03-14 11:54:42 +00:00
Adam Brown d89cc71eb4 making use of binding api instead of manual findviewbyid 2022-03-14 11:54:42 +00:00
Adam Brown edee6abafa using consistent method naming for setting the capabilities override 2022-03-14 11:54:42 +00:00
Adam Brown bdedffbb4f taking the personalization feature flag into account when calculating if personalization is supported
- also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
2022-03-14 11:54:42 +00:00
Adam Brown 7e79d7ed0e adding changelog entry 2022-03-14 11:54:42 +00:00
Adam Brown ab9e4405ce using correct label for the avatar capability debug override 2022-03-14 11:54:42 +00:00
Adam Brown 4b9b177104 forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile 2022-03-14 11:54:42 +00:00
Adam Brown b5778bd6c5 formatting 2022-03-14 11:54:42 +00:00
Adam Brown 716928d9d2 dynamically switching the onboarding flow based on the capabilities of the homeserver
- when avatars can't be changed we complete the personlisation flow
2022-03-14 11:54:42 +00:00
Adam Brown 46be481eda hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported 2022-03-14 11:54:42 +00:00
Adam Brown a033243475 adding test around account creation via dummy 2022-03-14 11:54:42 +00:00
Adam Brown 537c2f56a1 dynamically changing the account created layout based on if the homeserver supports personalisation 2022-03-14 11:54:42 +00:00
Adam Brown 3df4f1e099 adding entry points for injecting and overriding the homeserver capabilities 2022-03-14 11:54:42 +00:00
Adam Brown 50740b1449 extracting method for the handling of the profile picture selection 2022-03-14 11:54:42 +00:00
Adam Brown 10e4fd1707 updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration
2022-03-14 11:54:42 +00:00
Adam Brown 7ded9007db add click handling for the display name actions 2022-03-14 11:54:42 +00:00
Adam Brown 0685b57720 add click handling for the display name actions 2022-03-14 11:54:42 +00:00
Adam Brown 6c4381fda5 adding dedicated camera icon for choosing profile picture 2022-03-14 11:54:42 +00:00
Adam Brown 567fd9a13d extracting method for the handling of the profile picture selection 2022-03-14 11:54:42 +00:00
Adam Brown 232524ddc3 adding barebones profile picture fragment with ability to select a user avatar 2022-03-14 11:54:42 +00:00
Adam Brown 1c80914832 adding tests around the onboarding view model
- cases for the personalisation and display name actions
2022-03-14 11:54:42 +00:00
Adam Brown 074cde4519 add click handling for the display name actions 2022-03-14 11:54:41 +00:00
Adam Brown 4a1bf11168 adding base choose name fragment with UI 2022-03-14 11:54:41 +00:00
ariskotsomitopoulos d894d8598c Format text 2022-03-14 12:44:25 +01:00
ariskotsomitopoulos fef36d9334 Temporarily fix develop crash 2022-03-14 12:25:11 +01:00
ariskotsomitopoulos d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
ariskotsomitopoulos c2ec7cfa0f Add more clear documentation 2022-03-14 11:54:29 +01:00