Commit Graph

14365 Commits

Author SHA1 Message Date
ericdecanini
d11fc060ee Fixes crash due to empty constructor in CreatePollViewState 2022-03-17 13:46:16 +01:00
Eric Decanini
9c8f29e853 Merge branch 'develop' into bugfix/eric/voting-ended-poll 2022-03-17 12:07:45 +01:00
Aris Kotsomitopoulos
d1a77d2eca
Merge pull request #5378 from vector-im/feature/aris/threads_analytics
Feature/aris/threads analytics
2022-03-16 15:51:24 +01:00
ClaireG
d1bca78083
[Notification mode] Wrong mode is displayed when the mention only is selected on the web client 2022-03-16 14:51:10 +01:00
ariskotsomitopoulos
bcf3f1e302 Format code 2022-03-16 14:49:40 +01:00
ariskotsomitopoulos
eee1ec1423 Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:19:08 +01:00
Adam Brown
99b43fd771
Merge pull request #5433 from vector-im/sync-analytics-plan
Sync analytics plan
2022-03-16 12:04:59 +00:00
ariskotsomitopoulos
60db2e424e Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:01:09 +01:00
Adam Brown
e1b8a2e8ec trigger CI 2022-03-16 11:08:15 +00:00
Adam Brown
17d363cf9a
Merge pull request #5389 from vector-im/feature/adm/personalisation-complete
FTUE - Personalisation complete
2022-03-15 17:33:29 +00:00
ericdecanini
a46901ad6c Makes PollState a sealed interface 2022-03-15 18:10:47 +01:00
ericdecanini
a2d18d460a Fixes PollMode import error in TimelineFragment 2022-03-15 18:10:05 +01:00
Maxime NATUREL
9ef235f3d7
Merge pull request #5479 from vector-im/feature/mna/PSF-735-pinned-location
#5417: Pinned location sharing
2022-03-15 17:40:21 +01:00
aringenbach
a7639f4424
Merge pull request #5544 from vector-im/aringenbach/5521_permalink_base_url_mention
Fix mentions using matrix.to rather than client defined permalink base url
2022-03-15 17:28:16 +01:00
Maxime Naturel
b72c87da44 Renaming "btn" into "button" 2022-03-15 17:09:31 +01:00
Maxime Naturel
9ecf12a7ba Using extensions for Boolean? type 2022-03-15 17:09:31 +01:00
Maxime Naturel
abd25c2292 Removing Action suffix in ViewAction types 2022-03-15 17:09:31 +01:00
Maxime Naturel
6779fa1175 Change naming for initLocateButton() method 2022-03-15 17:09:31 +01:00
Maxime Naturel
f495150b4e Fixing asset type representation 2022-03-15 17:09:31 +01:00
Maxime Naturel
9864e51927 Adding changelog entry 2022-03-15 17:09:31 +01:00
Maxime Naturel
094e62c95b Adding unit tests for use case 2022-03-15 17:09:31 +01:00
Maxime Naturel
04405c7970 Distinguish user location and pinned location sharing 2022-03-15 17:09:30 +01:00
Maxime Naturel
8d1822da96 Recompute location comparison on new user location 2022-03-15 17:09:30 +01:00
Maxime Naturel
125b8d2058 Zoom to user location action 2022-03-15 17:09:30 +01:00
Maxime Naturel
01aff36597 Using style attibute for locate button visibility 2022-03-15 17:09:30 +01:00
Maxime Naturel
40e92842ea Show icon to reset map to user location 2022-03-15 17:09:30 +01:00
Maxime Naturel
57fcfeb1c1 Show dot pin for user location 2022-03-15 17:09:30 +01:00
Maxime Naturel
93c397d492 Updating location target drawable dynamically 2022-03-15 17:09:30 +01:00
Maxime Naturel
6fc6bf1c7d Compare locations use case implementation 2022-03-15 17:09:30 +01:00
Maxime Naturel
01879e252d Comparing target and user location using Flow in ViewModel 2022-03-15 17:09:29 +01:00
Maxime Naturel
dec075faf3 Handling press on pinned location option 2022-03-15 17:09:29 +01:00
Maxime Naturel
a1d155df71 Adding static pin at the center of the map 2022-03-15 17:09:29 +01:00
Maxime Naturel
9256b5671b Show options menu on top of the map 2022-03-15 17:09:29 +01:00
Arnaud Ringenbach
15e3f258f3 Fix wildcard imports 2022-03-15 16:55:24 +01:00
ariskotsomitopoulos
c3f1b748a3 Fix thread deleted root message summary 2022-03-15 16:34:17 +01:00
Onuray Sahin
db0cfd4704
Merge pull request #5455 from vector-im/feature/ons/fix_poll_start_notifications
Show notification for poll start events but not for responses
2022-03-15 18:34:03 +03:00
Arnaud Ringenbach
56760ecddc Create SpanTemplateType and factorize template creation 2022-03-15 16:33:59 +01:00
Adam Brown
9d49ef5f3a removing unused drawable 2022-03-15 15:12:51 +00:00
ericdecanini
98b7d194eb Adds getBestX following merge from develop 2022-03-15 15:54:30 +01:00
Onuray Sahin
a47b589e72 Code review fixes. 2022-03-15 17:51:02 +03:00
Onuray Sahin
7fa43f0d1b Merge branch 'develop' into feature/ons/fix_poll_start_notifications
* develop: (163 commits)
  Fix lint error.
  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
  ...
2022-03-15 17:49:53 +03: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
Arnaud Ringenbach
094ebe6764 Fix ktlint on TestPermalinkService 2022-03-15 14:57:59 +01:00
Arnaud Ringenbach
a68471afe3 Fix documentation on PermalinkService 2022-03-15 14:54:24 +01:00
Arnaud Ringenbach
c7aab7a3f6 Remove useless imports on TextPillsUtils 2022-03-15 14:52:13 +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
Arnaud Ringenbach
55fbed1a81 Remove useless PermalinkFactory import 2022-03-15 14:49:55 +01:00
Arnaud Ringenbach
ea4addf446 Fix TestPermalinkService header 2022-03-15 14:45:04 +01:00
ariskotsomitopoulos
7db2ff2cfd Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics 2022-03-15 14:35:31 +01:00