Commit graph

5844 commits

Author SHA1 Message Date
SpiritCroc
5c68ccf67d Automatic SchildiChat string correction
Change-Id: I5dff99fe89769fe352b2ff8d9f7c6b2814d48862
2021-05-12 16:01:51 +02:00
SpiritCroc
db6cfd3054 Merge tag 'v1.1.7' into sc
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2021-05-12 16:01:36 +02:00
SpiritCroc
51b4ebdda7 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I8f600d6c60e381d3948645ebe77b35bbc6dc5ae8
2021-05-12 15:45:49 +02:00
SpiritCroc
2269e0f1ed Merge branch 'spaces' into sc
Change-Id: Ia2a25202fab4e5be3c4800bb5cb6ab47fc828bac
2021-05-12 15:44:01 +02:00
Benoit Marty
72e343ad5a Better wording 2021-05-12 14:26:20 +02:00
Benoit Marty
6af9fda7df Fix lint issue 2021-05-12 14:06:59 +02:00
Benoit Marty
5d052cda79 Increase clickable area (no layout rendering change) 2021-05-12 13:55:47 +02:00
Benoit Marty
0d5b66f92b Flatten View hierarchy 2021-05-12 13:53:03 +02:00
Valere
391e952fbd Review + design update 2021-05-12 12:23:14 +02:00
Valere
df3d3b63c8 Code review 2021-05-12 11:04:54 +02:00
Valere
aefcb4841b Cleaning 2021-05-12 10:47:52 +02:00
Valere
eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Benoit Marty
03f2b516a0 Please the code quality checker 2021-05-12 10:17:33 +02:00
Benoit Marty
56d0699bc7
Merge pull request #3312 from vector-im/feature/bca/spaces_polish
Spaces various fixes and polish
2021-05-12 10:09:36 +02:00
Valere
1799dcbd0c Fix lint 2021-05-12 09:20:55 +02:00
Valere
0de56e2993 Code Review 2021-05-11 19:11:15 +02:00
Valere
eb9fadaebf user error when no space support on HS
remove buggy separators on add room; design update
2021-05-11 17:34:55 +02:00
Valere
91d8ee2a81 Space panel room ordering 2021-05-11 14:45:30 +02:00
SpiritCroc
e9e522603d Message footer: handle small width/height pictures
Change-Id: Ib8554c5057f09277cb9ef2a29a57d3a85cf35417
2021-05-11 12:21:41 +02:00
Valere
f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere
14144dc99d Default all in home + lab flag 2021-05-11 10:45:07 +02:00
Valere
24a32f2b7e Subspace more hierarchy depth + fix bad notification count 2021-05-11 10:07:34 +02:00
Weblate
d9ffff70a6 Merge branch 'origin/develop' into Weblate. 2021-05-11 07:55:27 +00:00
Hivaa
631d8510ed Translated using Weblate (Persian)
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2021-05-11 07:53:01 +00:00
Michael Sasser
4e28de2107 Translated using Weblate (German)
Currently translated at 99.5% (2428 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-05-11 07:52:56 +00:00
Valere
1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Valere
723f7cc326 VectorEpoxyHolder Form Ext 2021-05-10 20:01:17 +02:00
Valere
80366ee938 Code review 2021-05-10 20:01:17 +02:00
Valere
31b6d9844b Cleaning 2021-05-10 20:01:17 +02:00
Valere
f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +02:00
Valere
5be3faf914 Epoxy Form fixes 2021-05-10 19:59:04 +02:00
Benoit Marty
e6d4f9a1dc
Merge pull request #3298 from vector-im/feature/ypi/join_rules
Add joinRules field to RoomSummary
2021-05-10 19:54:44 +02:00
Benoit Marty
0e0cfababf
Merge pull request #3308 from vector-im/feature/fga/fix_timeline_read_marker
Fix read marker visibility/position when filtering some events
2021-05-10 19:54:19 +02:00
Benoit Marty
7ec44a5542
Merge pull request #3290 from vector-im/feature/bca/spaces_various_fixes
Various fixes on spaces explore
2021-05-10 19:52:45 +02:00
ganfra
525cd3edd7
Merge branch 'develop' into feature/fga/fix_timeline_read_marker 2021-05-10 17:33:52 +02:00
Valere
f1919be197 code review 2021-05-10 17:15:02 +02:00
ganfra
581847e5c1 Fix read marker visibility/position when filtering some events 2021-05-10 16:53:52 +02:00
Onuray Sahin
0f8a641510 Code review fixes. 2021-05-10 17:38:40 +03:00
Onuray Sahin
e74f4d570d Lint fix. 2021-05-10 17:22:32 +03:00
Valere
a272f4d4c6 Remove dead code 2021-05-10 15:48:06 +02:00
Onuray Sahin
87d35958c6 Allow inviting users even if profile information cannot be retrieved. 2021-05-10 16:34:30 +03:00
Valere
01ec263ff3 Fix deprecation warning 2021-05-10 14:59:38 +02:00
Benoit Marty
d760d6c25b Iterate with design team 2021-05-10 14:23:36 +02:00
SpiritCroc
1481a3edd3 Improve handling of DM layout
Previously, it could happen that DM-layout and non-DM-layout were mixed
in the same chat for following reasons:
- on purpose, when it is a DM, but in the past had messages by a third
  party
- not on purpose, when the room member information wasn't loaded in time
  for some messages, and thus the fallback assumed showing DM layout
  wasn't safe

However, this leads to an inconsistent layout, which looks bad.
Accordingly, this patch changes the behaviour as following:
- always use the DM layout for chats marked as DM
- if it is not clear if the message was sent by the actual DM partner,
  show the name (as opposed to previously: show name and avatar).

While this makes it more difficult to tell apart messages from the DM
partner and a third person, it is still possible, since the third person
has a name shown, and the DM partner's messages start with a bubble with
tail but without name. This is prefered to the previous solution, which
looked rather buggy than anything else.

Change-Id: I7c3e5ca7b04acec6eede345a9abde833ce0714d3
2021-05-10 10:25:28 +02:00
Valere
5e2c3239ea Code review 2021-05-10 10:21:43 +02:00
LinAGKar
d42a4bb5ee Translated using Weblate (Swedish)
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2021-05-09 19:34:31 +00:00
Marek
e951b2097d Translated using Weblate (German)
Currently translated at 97.4% (2376 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-05-09 19:34:29 +00:00
Benoit Marty
87b12b7e11 Add the public icon on the rooms in the room list (#3292) 2021-05-07 16:41:30 +02:00
SpiritCroc
5a8f637e58 Don't stretch image to sender name
Change-Id: I805e0359aedce07253cde1b84dc225f079efba1e
2021-05-07 14:58:00 +02:00
LinAGKar
3d613c003d Translated using Weblate (Swedish)
Currently translated at 99.3% (2421 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2021-05-07 12:34:29 +00:00