mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-22 01:04:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
12867 commits 160 branches 159 tags 271 MiB
Commit graph

1112 commits

Author SHA1 Message Date
Adam Brown
410cf5c062 adding UI toggle for email notifications in /settings/notifications 
- will display a _no emails_ when the matrix account has no emails set and tapping will navigate to the emails and phone numbers screen where the user can add an email
- toggling the email notification with register and unregister push notification for the given email address
 2021-09-21 10:47:03 +01:00
Adam Brown
1591375aa2 adding ability to remove push targets from the notification target screen 2021-09-20 16:35:53 +01:00
Florian Renaud
21d0a28150 Permalink: move supported hosts to config file 2021-09-17 16:46:09 +02:00
Valere
932a43ef58 Add subspace action 2021-09-17 09:22:10 +02:00
Valere
100ac49cac
Merge pull request #4000 from vector-im/feature/bca/fix_space_parent 
Fix parent relation handling
 2021-09-16 11:45:29 +02:00
Valere
421c2ae0ba Fix missing string resource 2021-09-16 10:30:43 +02:00
Valere
94f88c80fc Fix parent relation handling 2021-09-16 09:33:06 +02:00
Valere
cfed0f839b Code review 2021-09-16 09:20:25 +02:00
Valere
9a9a3d8cc6 Cherry pick room on leave space 2021-09-16 09:20:25 +02:00
Valere
8fd784e275 Improve leave space (all + none) 2021-09-16 09:20:25 +02:00
Valere
2c1435f08c Change default power to invite in private space + setting 2021-09-15 18:47:38 +02:00
Benoit Marty
1b59c7b451
Merge pull request #3989 from vector-im/feature/bca/space_fix_3956 
Fix /  Kick user dialog for spaces talks about rooms
 2021-09-14 20:35:40 +02:00
Valere
d758d5c270 Fix / Kick user dialog for spaces talks about rooms 2021-09-09 14:20:38 +02:00
Valere
99123bf0cc Add invite by email screen in create space flow 2021-09-07 14:10:57 +02:00
Peter Vágner
fac9a19c01 Add back a string that has been removed 
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-09-03 12:34:13 +02:00
Benoit Marty
42915a93db Fix warning "Multiple substitutions specified in non-positional format" 2021-08-30 11:52:43 +02:00
Benoit Marty
65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite 
support email invite
 2021-08-27 19:02:42 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
Valere
819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere
69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
David Langley
68eaefbc9c Show error dialog rather than toast. Add validation to keyword field for slashes and dots. 2021-08-27 15:48:11 +01:00
Valere
b9e2374a4c cleaning 
review


fix string warning
 2021-08-27 15:56:07 +02:00
Valere
6f45ba575b post rebase cleaning 2021-08-27 15:56:07 +02:00
Valere
de6b5af6ba Promote restricted join rule to admins 2021-08-27 15:56:07 +02:00
Benoit Marty
5b908c404e
Merge pull request #3863 from vector-im/feature/fga/new_voip_design 
Feature/fga/new voip design
 2021-08-27 12:02:35 +02:00
Benoit Marty
1815acf1ae
Merge pull request #3765 from vector-im/feature/bca/m11.12 
Spaces | Default to 'Home' in settings
 2021-08-27 12:01:52 +02:00
ganfra
fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
Benoit Marty
97bdd14880
Merge pull request #3854 from vector-im/feature/fga/call_end_reasons_dialog 
Call ended: handle busy reason and invite timeout.
 2021-08-26 11:40:27 +02:00
ganfra
4518962658 New voip design: clean after benoit review 2021-08-26 11:08:34 +02:00
David Langley
daaa40b27a Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-25 17:41:37 +01:00
Benoit Marty
f843712d7e
Merge pull request #3825 from vector-im/feature/dla/room_notification_settings 
Room Notification Settings V2
 2021-08-25 15:20:43 +02:00
David Langley
fb8c7f6be0 lint 2021-08-24 19:08:27 +01:00
David Langley
238f772461 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-24 15:51:23 +01:00
David Langley
be19f759f6 fix ordering of chips and align left for notification screens. 2021-08-24 15:46:41 +01:00
Valere
15cb31ac0d Code review 2021-08-24 16:39:32 +02:00
Valere
27df3e626e Spaces | Default to 'Home' in settings 2021-08-24 16:34:32 +02:00
ganfra
42bfa129b3 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-24 16:21:35 +02:00
ganfra
2b708387c2 New voip design: makes lint happy 2021-08-24 16:19:54 +02:00
Benoit Marty
18936122a8
Merge pull request #3773 from pvagner/a11yAvatarVerbosity 
a11y: change some content descriptions
 2021-08-23 12:15:43 +02:00
ganfra
3b1249c489 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-17 17:10:10 +02:00
ganfra
99a0d17dfc Call ended: handle busy reason and invite timeout. 2021-08-17 12:15:37 +02:00
ganfra
36581a1f31 VoiP : fix string resource 2021-08-16 15:38:52 +02:00
Peter Vágner
a05859b54c Merge branch 'develop' into voiceMessageA11Y 2021-08-16 13:17:22 +02:00
Péter Radics
bf919b89da [issue-2610] Merge branch 'develop' of github.com:mitchnull/element-android into feature/issue-2610-override-nick-color-via-user-account-data 2021-08-15 18:08:47 +02:00
ganfra
452647fb00 Remove jitsi widget: change threshold + wording 2021-08-12 18:50:58 +02:00
David Langley
a355f61a7e Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/room_notification_settings 2021-08-11 12:21:34 +01:00
ganfra
bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
ganfra
9027e94cfe Timeline call tiles: start changing status handling 2021-08-11 12:09:59 +02:00
David Langley
7f3c4f0073 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-08-10 10:54:22 +01:00
David Langley
8d7e3b6544 add keyword checkbox preference and chip/edit text for modificying keywords 2021-08-03 09:52:36 +01:00
Peter Vágner
ed6498fce1 a11y: change some content descriptions 
A lot of items e.g. member items, room items, space items as well as dialog top bar are prefixed with the word avatar. Remove this and make some accessibility specific strings shorter.

Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-08-01 22:03:59 +02:00
Peter Vágner
8c590b50e3 Improve accessibility of voice messages 
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-08-01 14:51:00 +02:00
Valere
aaa9c7e795 fix rebase 2021-07-30 19:05:47 +02:00
Valere
efdaa49e70 Code review 2021-07-30 18:44:25 +02:00
Valere
c9ef08d8a9 handle migration before setting restricted 2021-07-30 18:43:50 +02:00
Valere
6c2a917d9f WIP 2021-07-30 18:43:34 +02:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message 
Voice Message
 2021-07-30 17:24:17 +03:00
Onuray Sahin
1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
Onuray Sahin
cdd2fca258 Design review fixes. 2021-07-29 18:41:29 +03:00
David Langley
73bf50b93c rename global -> default, address comments 2021-07-27 20:21:40 +01:00
David Langley
7091de9942 merge in static push definitions and adapt push v2 ui/logic 2021-07-27 19:54:17 +01:00
Benoit Marty
a7e3c0d0d8 Fix wording when verification is cancelled. 2021-07-27 17:31:19 +02:00
Onuray Sahin
4c8a8d8cfb Design review fixes. 2021-07-27 15:32:35 +03:00
David Langley
57c32502e5 change notification state options as outlined in v2 2021-07-23 23:18:39 +01:00
David Langley
90e04d4358 add header footer and fix toolbar 2021-07-23 22:37:36 +01:00
Onuray Sahin
a11941714d Code review fixes. 2021-07-23 15:19:50 +03:00
ganfra
4788630949 Merge branch 'develop' into feature/fga/new_voip_design 2021-07-23 12:17:05 +02:00
Andrew Morgan
4dd5b2c884
grammar: Server matching ... -> Servers matching ... 
This commit uses the plural form of Server as each message is talking about *one or more* servers in the room.
 2021-07-22 11:58:32 +01:00
ganfra
8955049110 Minor changes after benoits review 2021-07-21 17:35:08 +02:00
ganfra
88cc7471a8 Call notification: add missed call icons. Also set tint. 2021-07-20 18:43:44 +02:00
ganfra
c59967fb6c Missed call: make some changes on notification 2021-07-20 09:40:09 +02:00
ganfra
f7e2e741c0 Missed call: start showing notification when there is a missed call 2021-07-19 20:25:09 +02:00
Paulo Pinto
0bdba9eb7d Standardise casing of terms in source strings 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-19 12:47:10 +01:00
Benoit Marty
bb742eb483 Handle record/play error 2021-07-15 15:06:38 +02:00
David Langley
baab726df2 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-07-14 10:18:54 +01:00
David Langley
a3204fdad9 add resValue to enable feature, put back old code 2021-07-13 21:22:56 +01:00
ganfra
3793df1b36 WebRTC Call : update call banner 2021-07-13 13:04:08 +02:00
Benoit Marty
83bf48dfff Fix denied permission issue 
And remove dead code
 2021-07-13 11:02:22 +02:00
Benoit Marty
9df874c975 Merge branch 'develop' into feature/ons/voice_message 2021-07-13 10:36:05 +02:00
Benoit Marty
067349f602 Fix some misunderstanding about the permissions request - step 2 2021-07-13 00:22:23 +02:00
David Langley
727ce7272a update translations 2021-07-12 18:38:56 +01:00
langleyd
d6f1f276c2 Add checkbox preference, remove PushRulePreference, Split adavanced fragment to new 3 new fragments and inherit common function 2021-07-12 14:07:27 +01:00
Benoit Marty
e391a1371c Merge branch 'develop' into feature/ons/voice_message 2021-07-09 22:19:50 +02:00
ganfra
74915c1e9e Jitsi: add Jitsi call alert (not branched) 2021-07-09 18:23:52 +02:00
ganfra
8e2a1d3bcd Jitsi call: implement RemoveJitsiWidgetView 2021-07-09 13:23:07 +02:00
Benoit Marty
2948f03978
Merge pull request #3551 from vector-im/feature/bca/room_upgrade 
Feature/bca/room upgrade
 2021-07-08 10:00:01 +02:00
Onuray Sahin
3372177b0e Design review fixes. 2021-07-07 16:44:42 +03:00
Onuray Sahin
5856e563c5 Put voice message preference under labs. 2021-07-07 10:23:22 +03:00
Onuray Sahin
7a1b138894 Merge branch 'develop' into feature/ons/voice_message 
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
 2021-07-06 13:17:49 +03:00
Benoit Marty
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown 
Improve wellknown usage
 2021-07-05 21:36:16 +02:00
David Baker
04cad290f7 Also change the emoji button subtitle 
and tweak the other string more because it's not "each other" either
 2021-07-05 19:49:48 +01:00
David Baker
fe4c4832bd Use different copy for self verification 
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
 2021-07-02 18:38:57 +01:00
Benoit Marty
ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Onuray Sahin
5676226f42 Voice message recording view implementations. 2021-07-01 10:47:41 +03:00
Benoit Marty
ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
ganfra
7c033b4090 Call UI: add toolbar 2021-06-30 18:08:44 +02:00
Benoit Marty
3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
Benoit Marty
08000dce55 Update the UI showing the homeserver API url in developer mode 2021-06-30 11:14:44 +02:00
Benoit Marty
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign 
Jump to unread: implement new design
 2021-06-28 16:45:06 +02:00
Valere
43a1e283c5
Merge pull request #3514 from vector-im/feature/bca/fix_join_errors 
Add error feedback when joining space rooms
 2021-06-24 09:56:32 +02:00
Valere
57c75f8039 Ugrade unstable room notice in settings 
default update parent, clean migrate bottomsheet layout
 2021-06-24 09:38:52 +02:00
Valere
171793d190 room version cap support + room upgrade 2021-06-22 17:35:39 +02:00
ganfra
121fd9a19d Jump to unread: implement new design 2021-06-22 16:29:19 +02:00
Valere
b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere
fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Onuray Sahin
69350ef514 Voice message UI initial implementation. 2021-06-17 16:17:38 +03:00
Valere
e277deece5 Add error feedback when joining space rooms 2021-06-16 17:35:25 +02:00
Benoit Marty
b5cc023fff
Merge pull request #3490 from vector-im/feature/bca/fix_3485 
Add warning to private space creation flow
 2021-06-16 14:47:12 +02:00
Valere
52f0d8a1d2 Add warning to private space creation flow 2021-06-15 14:01:03 +02:00
Benoit Marty
000b524b34 Move style and theme to the dedicated module 2021-06-15 12:39:39 +02:00
Benoit Marty
f411d9954e Rework drawer header, following Figma: more compact to let more space for spaces 2021-06-15 12:14:30 +02:00
Benoit Marty
f1a1f07a7b Doc 2021-06-15 11:18:01 +02:00
Benoit Marty
1370bda263 Fix issue of green back arrow on some screen 2021-06-15 10:51:01 +02:00
Benoit Marty
e918a6a93b Style for Toolbar 2021-06-15 10:42:29 +02:00
Benoit Marty
f90ee45d8c Use style to take into account lineHeight 2021-06-14 23:06:56 +02:00
Benoit Marty
1793885ec6 TextAppearances: import from figma and apply to login screens 2021-06-14 20:20:19 +02:00
Benoit Marty
2fb289ec14 Cleanup 2021-06-14 12:47:46 +02:00
Benoit Marty
dfb01a462e
Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab 
Feature/fga/dial pad tab
 2021-06-11 12:23:19 +02:00
Benoit Marty
75ee5d38fa
Merge pull request #3452 from vector-im/feature/fga/voip_asserted_identity 
Feature/fga/voip asserted identity
 2021-06-11 12:22:17 +02:00
Benoit Marty
0a065b0752 More cleanup 2021-06-11 10:12:31 +02:00
Benoit Marty
f8d07b0734 Cleanup theme again 2021-06-11 10:12:31 +02:00
Benoit Marty
0bac55ced7 Cleanup theme again 2021-06-11 10:12:31 +02:00
Benoit Marty
524c26b104 Split styles_riot.xml into several smaller files 2021-06-11 10:12:31 +02:00
Benoit Marty
b75a58b4d0 Create dedicated file for alert dialog style 2021-06-11 10:12:31 +02:00
Benoit Marty
d60e68c4ee Apply default style for SearchView 2021-06-11 10:12:31 +02:00
Benoit Marty
9dab8b9726 Extract bottom sheet style 2021-06-11 10:12:31 +02:00
Benoit Marty
3473d669d3 Use MaterialToolbar and AppBarLayout in all screens 2021-06-11 10:12:31 +02:00
Benoit Marty
8162d1100d Update navigation colors 2021-06-11 10:12:31 +02:00
Benoit Marty
5363526f77 Default style for Toolbar. Try to cleanup 2021-06-11 10:12:31 +02:00
Benoit Marty
992f41d631 Update status and system bar background colors - Approved by Gaëlle 2021-06-11 10:12:31 +02:00
ganfra
68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
ganfra
880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
 2021-06-10 15:37:24 +02:00
Benoit Marty
2f4aecd590 Composer update 
Author: Onuray. Update colors by bmarty and squashed
 2021-06-09 17:35:44 +02:00
Benoit Marty
047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00
ganfra
a421f37e70 VoIP : clean and add changelog 2021-06-03 19:50:09 +02:00
ganfra
ed56d12b72 Dialpad: fix some UI 2021-06-03 15:20:48 +02:00
Benoit Marty
90a16ebbaf /snow -> /snowfall and update wording (iso Element Web) (#3430) 2021-05-31 11:03:02 +02:00
Benoit Marty
575ebdc3e8
Merge pull request #3421 from vector-im/feature/fga/call_transfer 
Feature/fga/call transfer
 2021-05-28 16:48:01 +02:00
Benoit Marty
5657da3493
Merge pull request #3401 from vector-im/feature/bca/spaces_fix_3386 
Fixes #3386 show space description in explore header
 2021-05-28 15:27:49 +02:00
ganfra
34b012732e Call transfer: handle unknown person correctly 2021-05-28 14:28:32 +02:00
Benoit Marty
0db5dd3d50
Merge pull request #3419 from vector-im/feature/bma/gitter 
Feature/bma/gitter
 2021-05-27 21:23:05 +02:00
Benoit Marty
e925d29037 Avoid adding twice the same server 2021-05-27 15:37:26 +02:00
Benoit Marty
cbed1afaaa Add custom server 2021-05-27 14:05:34 +02:00
Benoit Marty
65f8546268 Add string 2021-05-26 16:03:44 +02:00
Benoit Marty
dec650eae8 Add Gitter.im as a default in the Change Network menu (#3196) 2021-05-26 16:03:28 +02:00
Valere
447bd98a78 Fixes #3386 show space description in explore header 2021-05-26 14:25:21 +02:00
Benoit Marty
cd66e62454 "home server" -> "homeserver" (#3404) 2021-05-26 12:44:04 +02:00
ganfra
e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
ganfra
bd8e46c84f Call transfer: start branching consult first action 2021-05-26 12:09:59 +02:00
Benoit Marty
b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi 
Feature/fga/authenticated jitsi
 2021-05-25 10:24:54 +02:00