Commit graph

8292 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
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
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
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
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
d35c1e833d Refactors MessageBubbleView 2022-03-14 13:05:35 +01:00
Adam Brown
c2fe669670 extracting the personalization complete emitting to a dedicated function 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
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
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
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
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
ericdecanini
2176129b11 Moves additional top space usage to bubble view 2022-03-14 11:46:48 +01:00
Maxime Naturel
8bb0a5cb4c Fixing wrong remove of import 2022-03-14 11:15:19 +01:00
Maxime Naturel
0942c6d648 Removing some with() code pattern 2022-03-14 11:15:19 +01:00
Maxime Naturel
a826a50c10 Renaming observe item count method 2022-03-14 11:15:19 +01:00
Maxime Naturel
f327eaa3f1 Adding item counter in add existing room to space screen 2022-03-14 11:15:19 +01:00
Maxime Naturel
20749e04cb Fix coding style 2022-03-14 11:15:18 +01:00
Maxime Naturel
30c6518630 Updating remaining category item 2022-03-14 11:15:18 +01:00
Maxime Naturel
3d27d9d2d2 Fix filtering use case 2022-03-14 11:15:18 +01:00
Maxime Naturel
c79aa267c3 Fix switching space use case 2022-03-14 11:15:18 +01:00
Maxime Naturel
d5345160fa Adding TODO 2022-03-14 11:15:18 +01:00
Maxime Naturel
ad9d36e58c Setting item count text only when > 0 2022-03-14 11:15:17 +01:00
Maxime Naturel
53c24d20b0 Moving notification badge on the right side 2022-03-14 11:15:17 +01:00
Maxime Naturel
0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
Maxime Naturel
c7dae341c0 (DRAFT) Room counter flow 2022-03-14 11:15:17 +01:00
Maxime Naturel
eb38c9d835 Fix remove of imports 2022-03-14 11:15:17 +01:00
Maxime Naturel
b1d1090d1d Adding number of items (UI part) 2022-03-14 11:15:17 +01:00
Maxime Naturel
70481e3ba3 Changing style of header 2022-03-14 11:15:16 +01:00
Claire G
025dcc8d88 Fix bug: readReceipt in wrong order 2022-03-14 10:28:42 +01:00