Commit graph

474 commits

Author SHA1 Message Date
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
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
Onuray Sahin
a11941714d Code review fixes. 2021-07-23 15:19:50 +03: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
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
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
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
Valere
52f0d8a1d2 Add warning to private space creation flow 2021-06-15 14:01:03 +02:00