Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-30 15:50:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,170 Commits 531 Branches 158 Tags 486 MiB
de4a7f2777
Commit Graph

12170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoit Marty
fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys 
Fallback keys implementation
 2021-12-13 23:36:20 +01:00
Benoit Marty
ea9a524048 Fix compilation issue after merge develop 2021-12-13 23:23:18 +01:00
Benoit Marty
10182902af Add posthog maven repo 2021-12-13 23:20:53 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Benoit Marty
e519e314fe Limit width of content on tablets 2021-12-13 23:16:47 +01:00
Benoit Marty
48fa411d83
Merge pull request #4698 from vector-im/feature/bma/emoji_hotfix 
Emoji fix
 2021-12-13 23:15:46 +01:00
Benoit Marty
2c81e7ea08
Merge pull request #4601 from vector-im/feature/aris/search_no_data_displayed_4600 
Fix issue 4600 that search results sometimes are not displayed properly
 2021-12-13 23:01:03 +01:00
Benoit Marty
3719551913
Merge pull request #4693 from SpiritCroc/spaceChildIds 
Fix possible crash when having identical subspaces in multiple root spaces
 2021-12-13 22:59:57 +01:00
Benoit Marty
240d0c0a5e
Merge pull request #4703 from vector-im/feature/bma/fix_poll_create 
Use only non empty option to create a poll
 2021-12-13 22:56:58 +01:00
Benoit Marty
b9799b46fd Fix test compilation 2021-12-13 22:45:24 +01:00
Benoit Marty
38e7e2fe4e
Merge pull request #4624 from vector-im/feature/ons/poll_timeline 
Poll Feature - Timeline
 2021-12-13 22:29:31 +01:00
Benoit Marty
28588eb10c Use only non empty option to create a poll 2021-12-13 22:17:43 +01:00
Benoit Marty
db81ec260e Recycle View a bit more 2021-12-13 21:49:40 +01:00
Benoit Marty
0981af3085 Remove unused attribute 2021-12-13 21:33:15 +01:00
Benoit Marty
f29e14fdd8 Rename class 2021-12-13 21:17:14 +01:00
Benoit Marty
da407ef8a2 Avoid lateinit 2021-12-13 21:16:44 +01:00
Benoit Marty
10b39ccd28 Do some renaming 2021-12-13 21:08:52 +01:00
Benoit Marty
eac06d5401 Do some renaming 2021-12-13 21:04:52 +01:00
Benoit Marty
c1ea653561 Reorder classes so that it follows the poll status logical order 2021-12-13 21:02:11 +01:00
Onuray Sahin
e2bbc3f8ae Code review fixes. 2021-12-13 22:47:15 +03:00
Benoit Marty
6e646b12b5 Add some comments and default values 2021-12-13 20:34:44 +01:00
Benoit Marty
78a7a61d07 Changelog 2021-12-13 20:31:52 +01:00
Benoit Marty
96b186ca8c Add tests to cover the new feature 2021-12-13 20:28:58 +01:00
Benoit Marty
e8fbbe2b97 Fix the test 2021-12-13 20:09:33 +01:00
Benoit Marty
c302148e89 Rename 2021-12-13 18:21:27 +01:00
Benoit Marty
808c401675 Fix a crash on Epoxy if text contains a MetricAffectingSpan 2021-12-13 18:16:58 +01:00
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