Commit graph

14300 commits

Author SHA1 Message Date
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
291d7d7627 Fix some doc comment 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
b72c357dd1 Removing unused imports 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
Maxime Naturel
134d7b2bf8 Adding changelog entry 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
ericdecanini
06e0047c22 Fixes import ordering in DefaultNavigator 2022-03-13 20:22:44 +01:00
ericdecanini
86765c9020 Adds new line at the end of PollState 2022-03-13 20:22:03 +01:00
ericdecanini
f24d8c2ada Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-13 20:13:03 +01:00
ericdecanini
610c67c208 Refactors buildPollItem in MessageItemFactory 2022-03-13 20:09:14 +01:00
Michael Kaye
acfeb7ff65
Merge pull request #5523 from vector-im/michaelk/concurrency_issue
Use different tags for unit tests and android test compilation.
2022-03-11 17:47:24 +00:00
Michael Kaye
9a532fc47f Use different tags for unit tests and android test compilation.
Otherwise we will cancel one in favour of the other.
2022-03-11 16:47:40 +00:00
Onuray Sahin
635be17d46 Changelog added. 2022-03-11 19:23:41 +03:00
Onuray Sahin
a12f918dd5 Add poll test for users try to change their votes after poll is ended. 2022-03-11 19:19:20 +03:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint
Changes room hierarchy endpoint to stable
2022-03-11 17:05:13 +01:00
Onuray Sahin
7c6167ace9 Add poll test for ended polls. 2022-03-11 18:59:27 +03:00
Benoit Marty
c3ac054634
Merge pull request #5518 from vector-im/bmarty-patch-1
Add space between icon and name
2022-03-11 16:47:59 +01:00
Benoit Marty
97f30ef7c1
Merge pull request #5520 from vector-im/feature/bma/fix_test_warnings
Fix all warnings in file E2eeSanityTests.kt
2022-03-11 16:47:25 +01:00
Benoit Marty
fa104adefc Fix all warnings in file E2eeSanityTests.kt 2022-03-11 15:35:21 +01:00
Benoit Marty
02ea1c0e7c
Add space between icon and name
Also remove extra space for the text_template
2022-03-11 14:39:38 +01:00
Benoit Marty
25cfc7e05f
Merge pull request #5506 from vector-im/michaelk/build_tests_on_pr
Compile tests on PR, to ensure we don't break the build when merging. Alert if we merge and the build fails.
2022-03-11 10:15:04 +01:00
Benoit Marty
d0a24afa5a
Merge pull request #5510 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.45
Bump libphonenumber from 8.12.44 to 8.12.45
2022-03-11 09:47:26 +01:00
Michael Kaye
9a112bb010 Remove confetti from build failed message.
(there will be red icons if the build has failed in the body anyway)
2022-03-11 08:45:27 +00:00
Michael Kaye
400a47c39b Only run one gradlew build for all tests, do not split by project 2022-03-11 08:45:04 +00:00
Onuray Sahin
8b08d3db25 Fix poll test for users vote different options. 2022-03-11 11:36:06 +03:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-10 23:09:19 +00:00
ericdecanini
7226864cc9 Improves code formatting in ResolveSpaceInfoTask 2022-03-10 21:41:17 +01:00
ericdecanini
6a59007eb5 Reverts debug isPollActive 2022-03-10 21:26:08 +01:00
Benoit Marty
eb7eb1aac8
Merge pull request #5505 from vector-im/feature/bma/must_be_tinted
Add colors for shield vector drawable
2022-03-10 20:39:29 +01:00
ericdecanini
6db1c377c4 Reverts to fix by removing event timestamp condition 2022-03-10 19:16:22 +01:00
ericdecanini
fe3c9cc09f Reverts to fix by removing event timestamp condition 2022-03-10 19:15:12 +01:00
ericdecanini
df6ae4b848 Fixes warning for debugging 2022-03-10 18:26:49 +01:00
ariskotsomitopoulos
f31b130b49 Fix unit tests 2022-03-10 19:11:14 +02:00
ariskotsomitopoulos
34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Michael Kaye
c57d22a72c Additionally notify the matrix channel if these tests fail when run
after merge to develop or main.
2022-03-10 16:41:00 +00:00