Commit Graph

197 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith 4325600d27 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 13:57:04 +01:00
Onuray Sahin 5953346b3d Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-10-14 15:17:55 +03:00
Jorge Martin Espinosa 81ef1415dc
Apply design changes to WYSIWYG editor (#7354)
* Apply design changes to WYSIWYG editor

* Add changelog

* Remove unneeded attribute in RichTextComposerLayout

* Fix lint issues

* Fix style naming issue.

* Change rich text editor border radius depending on the number of lines.

* Replace standby voice recorder icon.
2022-10-14 09:59:43 +02:00
Hugh Nimmo-Smith f04f0e6fac Revert "Revert "Partial implementation of QR login logic""
This reverts commit e305478dda.
2022-10-13 22:42:58 +01:00
Hugh Nimmo-Smith e305478dda Revert "Partial implementation of QR login logic"
This reverts commit 4b14ee4695.
2022-10-13 21:48:25 +01:00
Benoit Marty 92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13
Android 13
2022-10-13 13:52:52 +02:00
Maxime NATUREL f8f416e979
Merge pull request #7306 from vector-im/feature/mna/device-manager-extended-details
[Device Management] Render extended device info (PSG-773)
2022-10-12 18:09:33 +02:00
Eric Decanini 9857fa6ca4
Makes "Enable Notifications for this session" respond to enabled value in pusher (#7281)
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Links notification settings toggle to pusher service

* Adds changelog file

* Adds error handling to VectorSettingsNotificationPreferenceFragment

* Removes comment in FakePushersService

* Fixes post merge errors

* Fixes imports and improves string name

* Fixes legal copies

* Fixes kdoc punctuation

* Fixes string error

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Adds lost tests

* Adds PusherEntity migration

* Fixes session overview layout overlap

* Fixes switch being enabled by default

* Binds entire view to toggle switch
2022-10-12 09:27:55 -04:00
Onuray Sahin 1e1affbb7b Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-12 14:32:09 +03:00
Hugh Nimmo-Smith 4b14ee4695 Partial implementation of QR login logic 2022-10-11 23:34:05 +01:00
Onuray Sahin f272e566b0 Implement link a device flow. 2022-10-11 19:03:15 +03:00
Maxime NATUREL 7b352b44dc Replacing the feature flag by the new lab flag 2022-10-11 17:48:19 +02:00
Maxime NATUREL 3503c24acc Adding new lab flag for session manager 2022-10-11 17:48:17 +02:00
Jorge Martin Espinosa def67b2e7d
Integrate WYSIWYG editor (#7288)
* Add WYSIWYG lib dependency

* Replace EditText with RichTextEditor

* Add bold button, fix sending formatting messages issues

* Add missing inline formatting buttons, make scrollview horizontal

* Disable autocomplete for rich text editor

* Add formatted text to messages sent, replies, quotes and edited messages.

* Several fixes

* Add changelog

* Try to fix lint issues

* Address review comments.

* Exclude Epoxy KSP generated files from ktlint checks
2022-10-11 17:05:47 +02:00
Maxime NATUREL fdb61e26ee Rendering Device section with extended info 2022-10-11 15:23:22 +02:00
Maxime NATUREL 9f9f6e14be Rendering Application section into session details 2022-10-11 15:23:22 +02:00
Onuray Sahin 5566300665 Add qr code options to layout. 2022-10-11 14:15:44 +03:00
Onuray Sahin aacf2ba8a6 Refactor layout. 2022-10-11 13:08:43 +03:00
Eric Decanini 2fe636e93b
Adds Push Notification toggle to Device Manager (#7261)
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Fixes post merge errors

* Fixes legal copies

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error
2022-10-10 19:21:34 -04:00
Eric Decanini a096ff03c8
Merge pull request #7217 from vector-im/feature/eric/msc3881
Implements MSC3881 (enabled and device_id fields for Pusher API)
2022-10-10 12:37:47 -04:00
Vri 5430ca2966
correct login_set_email_notice
Corrected the string as noted in this comment by @lvre (https://translate.element.io/translate/element-android/element-app/en/?checksum=8cfc63845b17eca4#comments) over on Weblate.
2022-10-10 16:18:37 +02:00
Onuray Sahin ad208a0819 Refactor layout. 2022-10-10 13:48:25 +03:00
ericdecanini 4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
Onuray Sahin 2b452d6fe5 Implement qr code login failed states. 2022-10-07 19:04:27 +03:00
Onuray Sahin 04fb31666b Implement show qr code screen. 2022-10-07 17:34:41 +03:00
Benoit Marty 652069d520 Manage new Android 13 notification permission. 2022-10-06 18:56:23 +02:00
Onuray Sahin 945fa0a390 Create qr code login status view layout. 2022-10-06 14:55:43 +03:00
Onuray Sahin 5f6c8eebcf Navigate to the instructions screen. 2022-10-06 12:16:24 +03:00
Onuray Sahin 9859dab3cc Complete qr code login instructions screen. 2022-10-06 00:51:00 +03:00
Benoit Marty 8934eabc99 Remove TODO, the string `a11y_create_room` is actually used. 2022-10-05 16:33:05 +02:00
Benoit Marty 47457b39d0 Fix typo 2022-10-05 16:03:26 +02:00
Weblate 672ad3a5e5 Merge branch 'origin/develop' into Weblate. 2022-10-05 12:32:46 +00:00
Valere ec7c8c8b31
Merge pull request #6726 from vector-im/feature/bca/block_unverified
Per room block unverified devices
2022-10-05 14:29:59 +02:00
Weblate d13606bdcc Merge branch 'origin/develop' into Weblate. 2022-10-05 12:28:06 +00:00
Nui Harime 111f77b017 Translated using Weblate (Russian)
Currently translated at 98.3% (2380 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-10-05 12:27:54 +00:00
lvre 4de0f0a1e8 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-10-05 12:27:53 +00:00
Sveinn í Felli c39e64dfc7 Translated using Weblate (Icelandic)
Currently translated at 84.5% (2046 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-10-05 12:27:53 +00:00
Vri d5f542095c Translated using Weblate (German)
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-10-05 12:27:39 +00:00
Onuray Sahin 4fdb4e8c79 Create custom view for instructions section. 2022-10-05 13:23:39 +03:00
Benoit Marty a036cc6d75
Merge pull request #7287 from vector-im/feature/bma/en-us
Use American English by default.
2022-10-05 11:02:58 +02:00
Benoit Marty 2cd78282d9
Fix typo
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2022-10-05 11:02:33 +02:00
Valere 68d4ac34c7 Move setting to room profile 2022-10-05 10:27:12 +02:00
Valere 8de2fe8917 Update library/ui-strings/src/main/res/values/strings.xml
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-05 10:27:12 +02:00
Valere e9b33f6234 Per room block unverified devices 2022-10-05 10:27:12 +02:00
ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881
# Conflicts:
#	vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
2022-10-04 14:05:23 -04:00
Benoit Marty 4974fdf905
Merge pull request #6633 from Benjiko99/feature/incognito-keyboard
Add privacy setting to disable personalized learning by the keyboard
2022-10-04 18:22:22 +02:00
Onuray Sahin 6fbdd87dcf Create custom view for header section. 2022-10-04 17:05:42 +03:00
Benoit Marty c35fa978a7 Use American English by default. 2022-10-04 15:49:23 +02:00
Florian Renaud 8e3b9735c1
Merge pull request #7258 from vector-im/feature/fre/voice_broadcast_feature_flag
Voice Broadcast - Add a feature flag with the composer action
2022-10-04 11:25:33 +02:00
ericdecanini d14570dbea Replaces AppBuildConfig 2022-10-03 17:52:59 -04:00