mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
17114 commits 161 branches 158 tags 270 MiB
Commit graph

245 commits

Author SHA1 Message Date
Eric Decanini
aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes 
Potentially fixes intermittent crashing from sending gallery images
 2022-04-21 11:54:59 +02:00
ericdecanini
de899bbb18 Formats entire project 2022-04-21 11:50:15 +02:00
ericdecanini
6aa0be22c9 Makes MediaType internal 2022-04-21 10:42:08 +02:00
ericdecanini
0556a3d088 Makes MediaFileUtils function internal 2022-04-19 13:31:37 +02:00
Olivér Falvai
2bbecd4cc5 Fix regressions 2022-04-17 11:35:30 +02:00
Olivér Falvai
2c84f234a6 Cleanup 2022-04-17 11:09:10 +02:00
Olivér Falvai
4305b21ba8 Remove unused resource to make lint happy 2022-04-16 20:36:43 +02:00
Olivér Falvai
2138ec0799 Remove unused resource to make lint happy 2022-04-16 11:14:04 +02:00
Olivér Falvai
cdd7db4174 Fix unused resource references properly 2022-04-16 09:40:15 +02:00
Olivér Falvai
b3cfc88773 Fix androidTest 2022-04-15 23:36:42 +02:00
Olivér Falvai
a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
ericdecanini
b76ec78c5d Fixes build error in CameraVideoPicker 2022-04-14 11:46:59 +02:00
ericdecanini
da843443ef Convert MediaFileUtils to a non-object 2022-04-14 11:28:14 +02:00
Adam Brown
1f6068976d updating terms ids and applying design specified colours to the checkbox 2022-04-13 14:50:11 +01:00
ericdecanini
8b66034af5 Adds mkdirs fix to CameraPicker and CameraVideoPicker 2022-04-13 15:16:34 +02:00
Benoit Marty
23d2a290ab Global import optimization 2022-04-12 16:06:27 +02:00
Benoit Marty
fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback 
Feature/aris/threads beta feedback
 2022-04-05 17:25:29 +02:00
Benoit Marty
ca418afcbb
Merge pull request #5614 from vector-im/feature/aris/threads_ui_enhancements 
Feature/aris/threads UI enhancements
 2022-04-05 17:21:53 +02:00
Maxime NATUREL
bebe819c54
Merge pull request #5671 from vector-im/feature/mna/PSF-673-live-loc-share-duration 
#5667: [Location Sharing] - Set duration of live sharing
 2022-04-05 16:13:26 +02:00
ariskotsomitopoulos
6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements 
# Conflicts:
#	vector/src/main/res/menu/menu_timeline.xml
 2022-04-05 16:32:49 +03:00
Adam Brown
7e5c3df7a7 adding combined server selection/sign up fragment 2022-03-31 17:50:20 +01:00
Maxime NATUREL
265dd4a0c3 Using resource dimensions for margins 2022-03-31 14:44:40 +02:00
ariskotsomitopoulos
58cc3931b9 Add beta feedback for threads 2022-03-28 13:53:44 +03:00
Onuray Sahin
c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing 
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
 2022-03-23 13:32:36 +03:00
Benoit Marty
ed62a2f1c9 Format file (no other change) 2022-03-22 16:13:06 +01:00
Benoit Marty
f07c9bf105 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ariskotsomitopoulos
3c6dbd0843 Reduce timeline menu thread icon padding 2022-03-22 12:55:50 +02:00
dependabot[bot]
c2e3c63100
Bump json from 20211205 to 20220320 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-21 23:09:06 +00:00
Benoit Marty
579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch 
Presence indicator theme attribute
 2022-03-21 15:45:36 +01:00
Maxime Naturel
840a224c9f Fixing coding style issue 2022-03-18 15:01:44 +01:00
Adam Brown
4a7646a7ba providing online indicator color from the colors file instead of the element palette 2022-03-15 17:59:37 +00:00
Adam Brown
c257488ca8
Merge pull request #5513 from chagai95/add-presence-indicator-online 
add  presence indicator online
 2022-03-15 17:58:02 +00:00
Maxime Naturel
b72c87da44 Renaming "btn" into "button" 2022-03-15 17:09:31 +01:00
Maxime Naturel
01aff36597 Using style attibute for locate button visibility 2022-03-15 17:09:30 +01:00
Maxime Naturel
40e92842ea Show icon to reset map to user location 2022-03-15 17:09:30 +01:00
cfriedlander
3ef2f824e8 add presence indicator online 2022-03-11 11:10:11 +01:00
Benoit Marty
26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all 
Remove unused resources
 2022-03-10 13:03:27 +01:00
Benoit Marty
0122d8f933 Make comment about ignoring UnusedResources more valuable 2022-03-10 10:23:18 +01:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Maxime Naturel
89db867ab3 Fix attributes style id conflicts 2022-03-09 09:46:52 +01:00
Maxime Naturel
046d906f97 Moving view attributes into uikit dedicated file 2022-03-09 09:46:52 +01:00
Maxime Naturel
f4b5353424 Fix live location color on light theme 2022-03-09 09:46:52 +01:00
Maxime Naturel
8bcc594320 Changing color of the live location icon 2022-03-09 09:46:47 +01:00
Maxime Naturel
3bbb7167f1 Adding icon for live location 2022-03-09 09:45:00 +01:00
Benoit Marty
b867e5f072 Iterate on badge / unread indicator color (#5332) 2022-03-08 14:52:10 +01:00
Adam Brown
9a02543afd
FTUE - Choose a display picture (#5323) 
* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding base choose name fragment with UI

* add click handling for the display name actions

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding barebones profile picture fragment with ability to select a user avatar

* extracting uri filename resolving to a class which can be injected
- includes tests

* updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration

* adding test case for skipping profile picture setting

* taking the profile loading into account when rendering the onboarding loading

* extracting method for the handling of the profile picture selection

* adding dedicated camera icon for choosing profile picture

* adding toolbar to back to profile picture page
- this toolbar will fade in with the fragment as it sits at the fragment level, probably worth revisiting once more pages have a toolbar

* changing edit/add picture icon based on if we're already selected an image

* making use of debounced clicks to avoid potential extra clicks

* making the avatar height and camera icon relative percentage based
- also makes the avatar itself clicking, including a foreground ripple

* fixing formatting

* making use of fake session id for user id assertion

* using a real  matrix id syntax for the fake session user id

* removing duplicated dimens

* using self closing imageview tag
 2022-03-07 14:07:22 +00:00
Onuray Sahin
3156410965 Code review fixes. 2022-03-07 15:52:19 +03:00
Ahmed Radhouane Belkilani
bcdf004082
Update the top bar in a room (#5213) 
Remove typing message notification from room toolbar.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-03-04 16:38:53 +01:00
Onuray Sahin
2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing 2022-03-04 18:03:44 +03:00
Onuray Sahin
243a714586 Remove 3rd party waveform library. 2022-03-02 17:46:09 +03:00
Onuray Sahin
ab2001cd7f Create a custom audio waveform view. 2022-03-02 17:45:27 +03:00
Maxime Naturel
882b143569 Permission and error handling 2022-02-24 17:39:41 +01:00
Maxime Naturel
c6c46375d6 Creating a ViewModel 2022-02-24 17:39:40 +01:00
Maxime Naturel
e6995cbdd4 Draft 2022-02-24 17:39:40 +01:00
ericdecanini
4651c45b2f moves multipicker module to library 2022-02-22 19:48:48 +01:00
ericdecanini
c1afb3d5d1 moves attachment-viewer module to library 2022-02-22 19:44:30 +01:00
ericdecanini
b4ceaefeab moves diff-match-patch module to library 2022-02-22 19:40:17 +01:00
Maxime Naturel
d29fc9f2d3 Replacing vctr_unread_room_badge by vctr_content_secondary 2022-02-18 17:04:02 +01:00
Maxime Naturel
37a990368c Fixing text color of pills in light theme 2022-02-17 11:23:00 +01:00
Adam Brown
ea13f1c879
Merge pull request #5189 from vector-im/arb/issues/4640 
#4640 : The notification badge jumps around
 2022-02-11 14:18:41 +00:00
ganfra
0a52651e40 Reactions: update after remarks 2022-02-11 13:01:34 +01:00
Ahmed Radhouane Belkilani
a9a1532e01 #4640 
- change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
 - change unread badge color state for dark and light theme to align with iOS.
 - add changelog file related to the issue.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-02-11 11:45:39 +01:00
ganfra
0244fea222 Reactions: more refinements 2022-02-10 17:51:49 +01:00
ganfra
911ee97122 Reactions: start handling show more, show less and add more actions in timeline. 2022-02-09 21:29:03 +01:00
ganfra
04234318e5 Bubble: get LayoutDirection (RTL) from current Locale 2022-02-03 17:53:25 +01:00
ganfra
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Adam Brown
ba86834c6b removing forced san fontFamily, fixes other weights being ignored 2022-02-02 16:58:19 +00:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
2ce3894562 Create a UrlMapProvider for a better handling of RTL languages, and build the URLs in the controllers 2022-01-28 22:46:58 +01:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ganfra
ed9adf8367 Bubbles: fix paddings 2022-01-27 18:18:39 +01:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
ganfra
608d8a5d54 Bubbles: change colors 2022-01-24 19:31:04 +01:00
ganfra
8c4dff4db9 Bubbles: change again url preview 2022-01-21 16:00:58 +01:00
fedrunov
f7aedff418
toolbar management (#4887) 
Toolbar management rework and toolbar style alignment
 2022-01-21 13:38:27 +01:00
Adam Brown
36a26fcfd0 replacing the dark carousel background with a solid colour as par design changes 2022-01-19 10:17:04 +00:00
dependabot[bot]
8d37dc5118
Bump json from 20190722 to 20211205 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 23:08:02 +00:00
ganfra
5ee4984ec8 Bubbles: handle images and make small refactoring 2022-01-18 19:27:12 +01:00
Benoit Marty
2dfded7326 Remove comment 2022-01-18 14:42:32 +01:00
Benoit Marty
a38a03c980 Use class from common module 2022-01-18 14:41:35 +01:00
Benoit Marty
1c42df7752 Move the file to the new module. 2022-01-18 14:39:02 +01:00
Benoit Marty
ffad479dad Move the file to the new module. 2022-01-18 14:30:59 +01:00
Benoit Marty
194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty
f0d5260be8 Fix unit test 2022-01-18 12:34:14 +01:00
Benoit Marty
2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
Benoit Marty
bdd30e3b8f Fix crash when viewing source which contains an emoji. 
Import source of jsonviewer as a module of this project.
 2022-01-18 12:04:06 +01:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
ganfra
7ff8483592 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-17 19:19:29 +01:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update 
Updated splash carousel images and copy
 2022-01-17 15:11:08 +00:00
Adam Brown
f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown
c0b855e7c7 adding non light mode carousel background which uses a vertical gradient 2022-01-17 09:24:53 +00:00
ganfra
1108ef9fbe Bubbles: make it works for file, voice and polls. Also add parity for "modern" layout. 2022-01-14 19:19:23 +01:00
Benoit Marty
9a42e1e8c3 Move this class to the correct folder 2022-01-13 20:32:59 +01:00
Benoit Marty
b8aaa177c2 Add a module library/core-utils as a base module for all util tools 2022-01-13 20:28:50 +01:00
ganfra
d06df45e85 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-13 13:17:23 +01:00
ganfra
b9cc795996 Bubbles : fix background colors 2022-01-13 12:33:36 +01:00