Commit graph

191 commits

Author SHA1 Message Date
ganfra
32e72f54b3 Bubbles: add quick settings (temporary) 2022-01-12 19:01:13 +01:00
Benoit Marty
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog
Analytics
2021-12-14 09:31:55 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +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
Benoit Marty
6ba5c7af27 Legals: update setting icon 2021-12-10 15:35:46 +01:00
Benoit Marty
7f7199abd4 Add a help section in the settings. 2021-12-10 15:35:46 +01:00
Benoit Marty
5823777755 Legals: Move the 2 copyrights items to the new legal screen 2021-12-10 15:35:46 +01:00
Benoit Marty
e91e26ebfb Legals: Move the 3 element links to the new legal screen 2021-12-10 15:34:25 +01:00
Benoit Marty
d49a0dde6e Legals: Add the screen (WIP) 2021-12-10 15:34:25 +01:00
Onuray Sahin
b2e599ea2b Merge branch 'develop' into feature/ons/poll_timeline
* develop: (21 commits)
  Remove automation for new Delight board
  Remove automation for old Delight board
  Bump gradle from 7.0.3 to 7.0.4
  Bump realm-gradle-plugin from 10.8.1 to 10.9.0
  Bump libphonenumber from 8.12.38 to 8.12.39
  Bump mavericks from 2.4.0 to 2.5.0
  removing no longer possible branches
  adding a consistent padding to allow message types to avoid touching the side gutter
  Upgrade OLM to v3.2.7 and get it from our maven repository.
  removing manual send status spacing - it's no longer needed as the send status is always present (but invisible)
  removing manual end alignment for voice messages as send status gutter is now always present
  forcing the send spacing to always be taking into account - ensures all message lengths are consistent
  capping the preview image url based on the height - stops large screens eg tablets from attempting to fill the screen
  matching iOS max line rules for the preview description
  using themed colours for the close button
  limiting title to avoid overlapping with close icon
  flattening preview url view layout with custom view to reduce view hierarchy
  adding changelog entry
  updating url preview to match new designs
  removing now longer needed Mode argument
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_base.xml
2021-12-09 15:38:15 +03:00
Onuray Sahin
953fadeed4 Merge branch 'develop' into feature/ons/poll_timeline
* develop: (319 commits)
  Bump dagger from 2.40.4 to 2.40.5
  More debouncing
  Changelog
  I need the view here
  clicks() already has debouncing with conflate(), so throttleFirst is not necessary
  Use debouncedClicks where applicable
  Use `observeViewEvents` facility
  private
  use != rather that is
  Fix waring for state is not dialing or connected
  state can also be connected
  Add script to compress video and convert to gif file
  removing boolean notification version usage
  adding changelog entry
  removing unused imports and increasing enum allowance
  porting the notifications setting version to the vector features
  Add warning if unexpected state.
  setting login version via typed build config field instead of resources
  separating the SSO redirection from the login activities - adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
  Removing trailing space
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2021-12-07 18:50:52 +03:00
Benoit Marty
673cbb29de Merge branch 'develop' into feature/bma/posthog 2021-12-07 14:26:31 +01:00
Onuray Sahin
1df6b33981 Add labs flag for polls. 2021-12-07 11:53:52 +03:00
Adam Brown
e3155b6c98 removing notifications v1, v2 is live 2021-12-03 16:08:44 +00:00
Adam Brown
db406704c9 removing boolean notification version usage 2021-12-03 15:58:18 +00:00
Benoit Marty
869b5ad55b Analytics: add setting section 2021-12-02 14:10:03 +01:00
Benoit Marty
6cb8a2458f Remove extra new lines in XML 2021-12-01 23:06:49 +01:00
Benoit Marty
c84642aa33 Use @id and not @+id when referencing ids in xml 2021-12-01 22:27:57 +01:00
Benoit Marty
6d3df0d802 Use @id and not @+id when referencing ids in layouts - ConstraintLayout 2021-12-01 22:13:21 +01:00
Florian Renaud
6c81bf6ee8 Remove duplicated settings declaration 2021-11-22 18:03:07 +01:00
Benoit Marty
0a0dd4ee1b Fix crash when opening Identity Server detail from preference 2021-10-08 16:16:35 +02:00
Adam Brown
7b5972e3cf expanding the discovery polices on recieving a custom payload
- also meant updating the general link to discovery in order to manually pass the default arguments
2021-10-07 13:50:43 +01:00
Alex Baker
09a25cce4e Add Android Auto notification support
Signed-off-by: Alex Baker <alex@beeper.com>
2021-09-24 16:43:00 -05:00
Benoit Marty
045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle
Add email notification toggle
2021-09-24 20:42:44 +02:00
Benoit Marty
1ce48c4deb Add a dedicated setting to show debug info on screen 2021-09-23 13:54:03 +02:00
Adam Brown
710f2f92cb cleaning up the notification email group xml definition to include a self closing tag
- the category is dynamically populated so we shouldn't be adding anything static here anyways!
2021-09-21 13:46:23 +01:00
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
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
David Langley
1d767d6e3f Fix keyword style, preference persistence and add comment to keyword ruleid 2021-08-25 17:38:12 +01: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
Onuray Sahin
f6477d5e3b
Merge branch 'develop' into feature/ons/delabs_voice_message 2021-08-11 15:44:14 +03:00
Onuray Sahin
9b011f9fbd Enable voice message by default, remove from labs. 2021-08-10 17:58:41 +03: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
516a9bc929 fix path in notification settings xml 2021-08-03 10:58:52 +01:00
David Langley
8d7e3b6544 add keyword checkbox preference and chip/edit text for modificying keywords 2021-08-03 09:52:36 +01: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
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
David Langley
a29ccda68e move mutable push rule logic to static declarations as on web 2021-07-19 21:29:46 +01:00
David Langley
5044b21545 add changelog, checks/tests 2021-07-14 11:49:16 +01:00
David Langley
a3204fdad9 add resValue to enable feature, put back old code 2021-07-13 21:22:56 +01:00
David Langley
727ce7272a update translations 2021-07-12 18:38:56 +01:00
langleyd
7e156d372f Add checkbox preference, remove PushRulePreference, Split adavanced fragment to new 3 new fragments and inherit common function 2021-07-12 14:08:35 +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
Onuray Sahin
5856e563c5 Put voice message preference under labs. 2021-07-07 10:23:22 +03:00
Benoit Marty
047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00