filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,605 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

12605 Commits

Author SHA1 Message Date
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
Benoit Marty 32f2e7d508
Merge pull request #4541 from vector-im/feature/dla/fix_reply_and_quote_newlines 
Fix reply and quote newlines
 2022-01-07 17:45:32 +01:00
Benoit Marty 1232aa7d5b
Merge pull request #4878 from vector-im/feature/aris/minor_lint_change 
Minor lint fix
 2022-01-07 16:07:25 +01:00
ariskotsomitopoulos 50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos 5b6e70b1b4 While abortOnError = true for linter, lets always build the reports on error 2022-01-07 16:32:18 +02:00
ariskotsomitopoulos ae81f61958 fix integration test 2022-01-07 16:28:58 +02:00
Benoit Marty 37f0ffab8b Fix test compilation issue 2022-01-07 14:46:40 +01: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
Benoit Marty bcebfff1a2
Merge pull request #4864 from vector-im/feature/aris/linter_github_actions_improvement 
Enhance Linter Github Actions Reporting
 2022-01-07 14:25:29 +01: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 401479f140 Since the change are in the SDK, use the .removal extension for a better future changelog. 2022-01-06 21:07:57 +01:00
Benoit Marty b46b76c22a
Merge pull request #4753 from vector-im/feature/fre/tagged_events 
Support tagged events in Room Account Data (MSC2437)
 2022-01-06 21:06:44 +01: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
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 7ad0e2514f updating design doc to mention converting images to webp 2022-01-06 19:54:48 +00: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 0ea7fc2f10 adding changelog entry 2022-01-06 17:39:17 +00:00
Adam Brown 3465b7d844 switching the element onboarding flow to use FTUE_AUTH 
- this flow consistent of feature flag which can enable disable other parts, by default the I already have an account is enabled
 2022-01-06 17:21:08 +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
Florian Renaud 8d7b2ab5d8 Add missing json class annotation 2022-01-06 15:32:14 +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 12abd3b019 updating enum class counter 2022-01-06 10:25:41 +00: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 9e9b779186 moving the debug icon to the main source set 
- the onboarding uses the icon and it can be displayed for developer mode users
 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