Onuray Sahin
f028f9836b
Merge branch 'develop' into feature/ons/poll_timeline
...
* develop: (49 commits)
Update changelog.d/4592.bugfix
Remove jcenter from here, let's see what the CI will say
Common struct for each maven repo
Rename the file to group them
Add changelog file
Revert PR 4592 for devtools
Enhance include groups implementation by decoupling them to a separate file
Cleanup
Legals: improve API to get homeserver terms
Legals: update setting icon
Auto-review
Add a help section in the settings.
Changelog
Color for links
Use same height than the loading item to avoid dynamic resizing
Legals: only display external URLs.
Legals: Move the 2 copyrights items to the new legal screen
Add some space between the 2 TextViews, and improve the layout
Legals: Move the 3 element links to the new legal screen
Rename some classes
...
# Conflicts:
# vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
# vector/src/main/res/layout/item_timeline_event_poll_stub.xml
2021-12-13 17:44:21 +03:00
Onuray Sahin
f6dcda6841
Code review fixes.
2021-12-13 17:37:11 +03:00
Onuray Sahin
c7ad50a4d6
Code and design review fixes.
2021-12-13 17:07:17 +03:00
Benoit Marty
04d23ce7f6
Rename for clarity
2021-12-13 14:56:21 +01:00
Benoit Marty
ab70ee5ae2
Change usage of SpannableStringBuilder when this is not required
2021-12-13 13:14:20 +01:00
Benoit Marty
5ea7f3cbca
Merge pull request #4652 from vector-im/feature/bma/avoid_useless_codegen
...
Use viewBindingIgnore="true" when we do not need the ViewBinding.
2021-12-13 12:51:05 +01:00
Benoit Marty
df3f8bd88e
Use emoji2 library
2021-12-13 12:36:46 +01:00
Benoit Marty
b701bb7c1a
Fix crash when using TextFuture with MetricAffectingSpan added by EmojiCompat ( #4691 )
2021-12-13 12:14:24 +01:00
Benoit Marty
406881c8a7
Merge pull request #4689 from vector-im/feature/aris/dev_tools_fix_4592
...
Feature/aris/dev tools fix 4592
2021-12-13 11:37:53 +01:00
Benoit Marty
3620a265d0
Merge pull request #4650 from vector-im/feature/bma/id_ref
...
Cleanup id ref. Use type views instead.
2021-12-13 11:32:18 +01:00
Benoit Marty
a6dec7b9cb
Merge pull request #4670 from vector-im/feature/bma/safer_dependencies
...
Safer dependencies
2021-12-13 11:30:15 +01:00
Aris Kotsomitopoulos
2fbcc96b4d
Update changelog.d/4592.bugfix
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2021-12-13 11:06:59 +02:00
SpiritCroc
9a84c45ccd
Changelog
2021-12-12 12:20:33 +01:00
SpiritCroc
f1ee8183e5
Ensure unique ids for subspaces
...
When you have two root spaces with the same space as subspace, and you expand both root spaces, you end up with two times the same id in the list. This has two problems:
- The expand animation is slightly broken, if you expand the second root space first and then the first one
- If you select one of these items with same id, the app crashes:
java.lang.IllegalStateException: Two different ViewHolders have the same stable ID. Stable IDs in your adapter MUST BE unique and SHOULD NOT change.
As solution, just prefix the epoxy item ids with the parent spaces.
2021-12-12 12:09:25 +01:00
Denys Nykula
7d169a8a8d
Translated using Weblate (Ukrainian)
...
Currently translated at 97.8% (2634 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2021-12-12 06:25:58 +00:00
Ihor Hordiichuk
790049f33a
Translated using Weblate (Ukrainian)
...
Currently translated at 97.8% (2634 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2021-12-12 06:25:58 +00:00
Benoit Marty
b49c30d879
Merge pull request #4635 from vector-im/feature/adm/debug-features-override
...
Debug features override
2021-12-11 12:39:49 +01:00
Benoit Marty
7c2ed46dd7
Remove jcenter from here, let's see what the CI will say
2021-12-10 21:40:32 +01:00
Benoit Marty
a71f2415a6
Common struct for each maven repo
2021-12-10 21:35:48 +01:00
Benoit Marty
45ff069d66
Rename the file to group them
2021-12-10 21:19:43 +01:00
ariskotsomitopoulos
6c296d53bf
Add changelog file
2021-12-10 19:46:54 +02:00
ariskotsomitopoulos
c77fa38cc3
Revert PR 4592 for devtools
2021-12-10 19:45:27 +02:00
ariskotsomitopoulos
c514a3b063
Enhance include groups implementation by decoupling them to a separate file
2021-12-10 19:09:14 +02:00
Linerly
947b7afb00
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (39 of 39 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2021-12-10 15:26:13 +00:00
אלון גלסמן
431064e5f8
Translated using Weblate (Hebrew)
...
Currently translated at 77.0% (2075 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
2021-12-10 15:26:12 +00:00
Ihor Hordiichuk
49579f17e4
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (39 of 39 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-12-10 15:26:06 +00:00
Glandos
47d08e7849
Translated using Weblate (French)
...
Currently translated at 100.0% (39 of 39 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-12-10 15:26:04 +00:00
Ihor Hordiichuk
6ef556e834
Translated using Weblate (Ukrainian)
...
Currently translated at 97.0% (2613 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2021-12-10 15:26:03 +00:00
Denys Nykula
e7cf9f51e7
Translated using Weblate (Ukrainian)
...
Currently translated at 97.0% (2613 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2021-12-10 15:26:03 +00:00
Jozef Gaal
a940fcaf8b
Translated using Weblate (Slovak)
...
Currently translated at 52.6% (1417 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2021-12-10 15:26:02 +00:00
Suguru Hirahara
e8d8814c80
Translated using Weblate (Japanese)
...
Currently translated at 69.3% (1868 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2021-12-10 15:26:02 +00:00
Linerly
d0400641e6
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (2693 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2021-12-10 15:25:59 +00:00
Glandos
a9aea96db4
Translated using Weblate (French)
...
Currently translated at 100.0% (2693 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2021-12-10 15:25:59 +00:00
Jiri Grönroos
07b04b6e55
Translated using Weblate (Finnish)
...
Currently translated at 84.9% (2289 of 2693 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
2021-12-10 15:25:58 +00:00
Benoit Marty
a090642c67
Cleanup
2021-12-10 16:22:01 +01:00
Valere
76960f8b67
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:12:14 +01:00
Valere
38a8e8b003
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:11:58 +01:00
Benoit Marty
ba8121641f
Merge branch 'develop' into feature/bma/avoid_useless_codegen
2021-12-10 16:09:47 +01:00
Benoit Marty
34898f1c81
Merge pull request #4660 from vector-im/feature/bma/legals
...
Legals
2021-12-10 16:06:49 +01:00
Onuray Sahin
9b2a3cf445
Code review fixes.
2021-12-10 17:57:57 +03:00
Benoit Marty
bf7907a119
Legals: improve API to get homeserver terms
2021-12-10 15:35:46 +01:00
Benoit Marty
6ba5c7af27
Legals: update setting icon
2021-12-10 15:35:46 +01:00
Benoit Marty
72bb58645b
Auto-review
2021-12-10 15:35:46 +01:00
Benoit Marty
7f7199abd4
Add a help section in the settings.
2021-12-10 15:35:46 +01:00
Benoit Marty
17c4c1e9b8
Changelog
2021-12-10 15:35:46 +01:00
Benoit Marty
287587f356
Color for links
2021-12-10 15:35:46 +01:00
Benoit Marty
50a84a6c56
Use same height than the loading item to avoid dynamic resizing
2021-12-10 15:35:46 +01:00
Benoit Marty
eed7d15b0e
Legals: only display external URLs.
2021-12-10 15:35:46 +01:00
Benoit Marty
5823777755
Legals: Move the 2 copyrights items to the new legal screen
2021-12-10 15:35:46 +01:00
Benoit Marty
a8c921ef03
Add some space between the 2 TextViews, and improve the layout
2021-12-10 15:34:25 +01:00