Commit Graph

7980 Commits

Author SHA1 Message Date
ariskotsomitopoulos 4560d748d3 Display encrypted messages in thread summary and in thread list 2022-01-11 17:52:14 +02:00
ariskotsomitopoulos 753e3e7519 - fix ktlint format
- Update Threads toolbar UI
2022-01-11 15:31:21 +02:00
ariskotsomitopoulos 3bd21d04d8 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
Benoit Marty 5b1de70742
Merge pull request #4902 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-01-11 12:26:23 +01:00
Benoit Marty d2bad95044
Merge pull request #4904 from vector-im/feature/adm/ftue-copy-typo
Typo in carousel title
2022-01-11 12:15:59 +01:00
Adam Brown d485e69062
Merge pull request #4740 from vector-im/feature/adm/automatic-splash-carousel-transitions
Automatic carousel rotation
2022-01-11 11:14:41 +00:00
Adam Brown 71eaac39aa fixing typo in carousel title 2022-01-11 11:06:29 +00:00
Weblate 7cbaf92690 Merge branch 'origin/develop' into Weblate. 2022-01-11 09:08:49 +00:00
Benoit Marty 6a1940cdd2
Merge pull request #4896 from vector-im/feature/bma/add_languages
Add some missing languages in the change language screen
2022-01-11 10:04:02 +01:00
Benoit Marty f5291f4730 Add a comment about the workaround 2022-01-11 10:03:30 +01:00
Valere bf447afa5a
Remove deprecated restricted lab option (#4889)
Remove deprecated restricted lab option
2022-01-11 09:01:37 +00:00
Benoit Marty 008034895b
Merge pull request #4893 from vector-im/feature/ons/fix_create_poll_recyclerview
Workaround to not to reuse poll option cells
2022-01-11 10:00:16 +01:00
Weblate 175b8cc78b Merge branch 'origin/develop' into Weblate. 2022-01-11 08:54:39 +00:00
Benoit Marty 75541e0296 Add some missing language in the change language screen 2022-01-10 18:22:30 +01:00
Onuray Sahin 5feafbdbf1 Workaround to not to reuse poll option cells. 2022-01-10 17:28:07 +03:00
Benoit Marty f368ec15d8
Merge pull request #4892 from vector-im/feature/bma/analytics_opt_in
Revert "Disable automatic opt-in screen display."
2022-01-10 15:03:19 +01:00
Benoit Marty d5968e442c Test: Fix test after change on OnBoarding screens 2022-01-10 14:31:29 +01:00
Benoit Marty a552be040d Test: Analytics opt-in 2022-01-10 14:16:58 +01:00
Benoit Marty 67c2f9ac51 Cleanup 2022-01-10 14:16:03 +01:00
Benoit Marty 6f348813a2 Revert "Disable automatic opt-in screen display."
This reverts commit 08def813cc.
2022-01-10 13:45:02 +01:00
ariskotsomitopoulos 1b41a72e72 Fix Quote from within a thread 2022-01-10 14:14:11 +02:00
ariskotsomitopoulos 6503412928 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-10 13:26:57 +02:00
ariskotsomitopoulos e541636802 Make TimelineSettings aware of rootThreadEventId and welcome a new Thread mode for the timeline creation 2022-01-10 11:20:31 +02:00
Valere a047bcbabe restore deprecated lab preference 2022-01-10 09:46:11 +01:00
Valere 258d731102 Change autoUisi label + rename matching_issue 2022-01-10 09:41:51 +01:00
Valere de08afdfad code review 2022-01-10 09:41:51 +01:00
Valere aa89e721aa Fix enabling was broken 2022-01-10 09:41:51 +01:00
Valere 56dac76ca8 Simple rate limiting of RS sending 2022-01-10 09:41:51 +01:00
Valere 401e8e6712 use flow instead of reactivex 2022-01-10 09:41:51 +01:00
Valere cf026b22b8 Fix UISIS preference listener 2022-01-10 09:41:51 +01:00
Valere be119ea161 Support for lab auto rageshake UISI 2022-01-10 09:41:51 +01:00
Jozef Gaal b9b2dd420f Translated using Weblate (Slovak)
Currently translated at 67.8% (1842 of 2713 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-01-09 13:26:37 +00:00
Johan Smits 31dcd9ab3f Translated using Weblate (Dutch)
Currently translated at 76.9% (2089 of 2713 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-01-09 13:26:36 +00:00
Jozef Gaal 7bea203187 Translated using Weblate (Slovak)
Currently translated at 67.7% (1839 of 2713 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-01-08 08:26:07 +00:00
Szimszon 34cd11b439 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2713 of 2713 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2022-01-08 08:26:06 +00:00
Danial Behzadi 459c294147 Translated using Weblate (Persian)
Currently translated at 100.0% (2713 of 2713 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2022-01-08 08:26:06 +00:00
waclaw66 8e855f6dcf Translated using Weblate (Czech)
Currently translated at 100.0% (2713 of 2713 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2022-01-08 08:26:05 +00:00
Adam Brown 70c82443ee simplifying the automatic transitions and matching iOS by scheduling the next transition once the page settles
- means there's always a 5 second delay when manually skipping toa page
2022-01-07 15:51:03 +00:00
Adam Brown a0bda02824 disabling user input whilst the automatic animation is taking place, fixes crashes when user input is attempted at the same time 2022-01-07 15:41:53 +00:00
Adam Brown 5de76380ad supporting rtl dragging in the viewpager setCurrentItem 2022-01-07 14:44:20 +00:00
ariskotsomitopoulos 50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
Adam Brown 0d2ad2d85d adding back debug option to enable carousel (was rebased away) 2022-01-07 13:47:20 +00:00
Benoit Marty d14dadde27
Merge branch 'develop' into feature/dla/fix_reply_and_quote_newlines 2022-01-07 14:43:41 +01:00
Adam Brown 486671f385 making the incrementing helper specific to increments of 1 and incrementing first before returning the minimum value 2022-01-07 13:38:22 +00:00
Adam Brown fa30691583 adding automatic rotation of the onboarding carousel items
- items change every 5 seconds
- uses fake dragging to control the page transition speed, by default it's too fast
2022-01-07 13:38:22 +00:00
Adam Brown 28f6d10af9
Merge pull request #4727 from vector-im/feature/adm/splash-carousel
FTUE Splash carousel MVP
2022-01-07 13:36:39 +00:00
ariskotsomitopoulos ac5caccdf9 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Adam Brown 785a142720 moving the carousel backgrounds to the ui-styles module 2022-01-07 11:17:39 +00:00
Adam Brown 8a3652aec2 moving the static carousel state creation to the state constructor 2022-01-07 11:16:24 +00:00
Benoit Marty 3f9bea308a
Merge pull request #4872 from vector-im/feature/adm/enabling-ftue-already-have-account
Enabling FTUE_AUTH onboarding variant
2022-01-06 20:57:51 +01:00