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
ariskotsomitopoulos
50e51cbe29
Merge branch 'develop' into feature/aris/threads
2022-01-07 16:36:48 +02: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
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
b852b9de9c
Merge pull request #4871 from vector-im/feature/nfe/qr_scanner_toolbar
...
Toolbar is added to a views with QR code scan
2022-01-06 20:55:06 +01:00
Adam Brown
0868ca9c77
deleting tmp carousel images from the hdpi package, will wait until we have the final images before creating separate densities
2022-01-06 19:54:48 +00:00
Adam Brown
313a2a88e6
removing redundant strings provider
2022-01-06 19:54:48 +00:00
Adam Brown
f62ebbc33a
using fragment module provided injections to enable using the constructor for project consistent
2022-01-06 19:54:48 +00:00
Adam Brown
58d9da5bd2
adding missing super
2022-01-06 19:54:48 +00:00
Adam Brown
5df47fba53
reverting rebased named change
2022-01-06 19:54:48 +00:00
Adam Brown
d71930901b
disabling ftue auth carousel whilst its in dev
2022-01-06 19:54:48 +00:00
Adam Brown
633f495e2c
extracting the inner carousel fragment classes
2022-01-06 19:54:48 +00:00
Adam Brown
c0db9f7ca1
converting temporary carousel images to webp
2022-01-06 19:54:48 +00:00
Adam Brown
6929c947b0
adding gradient backgrounds to the carousel pages
...
- also coverts the carousel pages to constraint layout and makes use of gutters to provide percentage based sizing
2022-01-06 19:54:48 +00:00
Adam Brown
a2f780bef4
adding carousel content, images are temporary
2022-01-06 19:54:48 +00:00
Adam Brown
955fb03532
adding barebones splash carousel fragment, based on feature flag
2022-01-06 19:54:48 +00:00
Adam Brown
773d335add
adding debug feature flag for the splash carousel
2022-01-06 19:54:47 +00:00
Adam Brown
2541c3f6a5
copying all of the login fragments into the ftue auth domain
2022-01-06 17:50:13 +00:00
Adam Brown
16ed3f799f
adding I already have an account functionality to the ftue auth splash
2022-01-06 17:50:13 +00:00
Adam Brown
fa939a2181
cloning the splash fragment into the onboarding
2022-01-06 17:50:13 +00:00
Adam Brown
e75764632c
renaming the ftue domain to onboarding and ftue to ftue auth
2022-01-06 17:50:13 +00:00
Adam Brown
f24c962a4a
Merge pull request #4668 from vector-im/feature/adm/i-already-have-an-account
...
FTUE Auth - I already have an account
2022-01-06 17:11:44 +00:00
fedrunov
f35ffb0a60
referencing layout with @+id changed to @id according to code quality rules
2022-01-06 17:57:16 +01:00
fedrunov
6bfd9d07a9
Toolbar is added to a views with QR code scan
2022-01-06 17:11:23 +01:00
Adam Brown
41f931e466
renaming parameters and properties to avoid clashing with kotlin/java8 keywords
2022-01-06 14:17:23 +00:00
Adam Brown
b40324a8ba
Merge pull request #4738 from vector-im/feature/adm/cloning-login-fragments-to-ftue
...
Cloning the `Login` fragments to `FtueAuth`
2022-01-06 13:59:46 +00:00
Benoit Marty
296929e179
Merge pull request #4790 from vector-im/feature/adm/emoji-recycling
...
Timeline recycling crash
2022-01-06 14:55:29 +01:00
Adam Brown
6fbf8faf53
using fragment constructor vai fragment module instead of hilt entry point
2022-01-06 10:03:13 +00:00
Adam Brown
ccd2d95f0f
removing duplicated layout file
2022-01-06 10:03:13 +00:00
Adam Brown
c6396ac03a
updating debug feature label to explain that it's related to the ftue auth
2022-01-06 10:03:13 +00:00
Adam Brown
380f079ab7
taking the already have an account feature flag into account in the ftue auth splash
2022-01-06 10:03:13 +00:00
Adam Brown
e3c0b34651
adding support for the boolean features and adding a new flag for the already have an account
2022-01-06 10:03:13 +00:00
Adam Brown
768419b11a
using correct views instances - fixes missing loading
2022-01-06 10:03:13 +00:00
Adam Brown
d5373545f0
styling the debug trigger in the ftue splash
2022-01-06 10:03:13 +00:00
Adam Brown
2647e061a2
copying all of the login fragments into the ftue auth domain
2022-01-06 10:03:13 +00:00
Adam Brown
811613fa4d
adding I already have an account functionality to the ftue auth splash
2022-01-06 10:03:13 +00:00
Adam Brown
538f51e2d2
adds a debug menu entry point in the splash debug info
2022-01-06 10:03:13 +00:00
Adam Brown
7b3163e140
cloning the splash fragment into the onboarding
2022-01-06 10:03:13 +00:00
Adam Brown
8de892bc60
renaming the ftue domain to onboarding and ftue to ftue auth
2022-01-06 10:03:13 +00:00
Adam Brown
3e1801a5c4
clones the login view model domain to the ftue so that we can start overriding and merge login2 behaviour
2022-01-06 10:03:13 +00:00
Adam Brown
e091ea82da
porting the LoginActivty2 to a dynamic FTUE activity
...
- supports switching between a copied legacy flow (DefaultFTUE) and the WIP variant
- this will allow us to make iterative changes to the default ftue flow without affecting the legacy flow/forks
2022-01-06 10:03:13 +00:00
Adam Brown
603c2fa690
updating out of sync provider function name
2022-01-06 10:02:49 +00:00
Adam Brown
98b88c104a
adding all the ftue auth fragments to the fragment module
2022-01-06 10:02:48 +00:00
Adam Brown
8d819c76ab
copying all of the login fragments into the ftue auth domain
2022-01-06 09:44:59 +00:00
Adam Brown
355d8ebdc6
Merge pull request #4657 from vector-im/feature/adm/cloning-login-domain-to-ftue
...
Cloning the `LoginViewModel` domain to `Onboarding`
2022-01-06 09:43:46 +00:00
