Commit graph

1214 commits

Author SHA1 Message Date
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
04a7590804 Code review fixes. 2021-12-09 15:09:12 +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
Adam Brown
7e6a5f944f adding a consistent padding to allow message types to avoid touching the side gutter 2021-12-07 15:14:39 +00:00
Adam Brown
23bc867b95 removing manual send status spacing
- it's no longer needed as the send status is always present (but invisible)
2021-12-07 13:47:29 +00:00
Onuray Sahin
566f6332bc Set max length for poll options. 2021-12-07 14:43:27 +03:00
Adam Brown
3ff3507fa1 forcing the send spacing to always be taking into account
- ensures all message lengths are consistent
2021-12-07 11:33:57 +00:00
Adam Brown
5cfebb764c capping the preview image url based on the height
- stops large screens eg tablets from attempting to fill the screen
2021-12-07 11:32:51 +00:00
Adam Brown
9094173b52 matching iOS max line rules for the preview description 2021-12-07 11:32:51 +00:00
Adam Brown
f3f28f3989 limiting title to avoid overlapping with close icon 2021-12-07 11:32:51 +00:00
Adam Brown
0150d830d4 flattening preview url view layout with custom view to reduce view hierarchy 2021-12-07 11:32:50 +00:00
Adam Brown
952ceced05 updating url preview to match new designs 2021-12-07 11:32:32 +00:00
Onuray Sahin
1df6b33981 Add labs flag for polls. 2021-12-07 11:53:52 +03:00
Onuray Sahin
32e8a7e886 Remove legacy poll ui. 2021-12-03 11:40:12 +03:00
Onuray Sahin
06485cf5e4 Implement poll in timeline ui. 2021-12-03 11:39:41 +03:00
Benoit Marty
6cb8a2458f Remove extra new lines in XML 2021-12-01 23:06:49 +01:00
Benoit Marty
d42473becb More cleanup, remove useless attribute "orientation" 2021-12-01 22:58:21 +01:00
Benoit Marty
696c537f96 All the cleanup and rework end up by fixing some mistakes :) 2021-12-01 22:49:16 +01:00
Benoit Marty
6624039413 Use @id and not @+id when referencing ids in layouts - RelativeLayout and toolbarId 2021-12-01 22:44:07 +01:00
Benoit Marty
e106ff8de0 Use @id and not @+id when referencing ids in layouts - ConstraintLayout 2021-12-01 22:19:33 +01:00
Benoit Marty
2d17156861 Use @id and not @+id when referencing ids in layouts - accessibilityTraversal 2021-12-01 22:16:28 +01:00
Benoit Marty
6d3df0d802 Use @id and not @+id when referencing ids in layouts - ConstraintLayout 2021-12-01 22:13:21 +01:00
Benoit Marty
97a44a5632
Merge pull request #4523 from vector-im/feature/adm/voice-composer
Moving voice logic to the MessageComposer
2021-11-22 15:01:40 +01:00
Benoit Marty
4af2780ad9 Password hidden by default 2021-11-19 17:31:04 +01:00
Adam Brown
f140dbc0a0 update text composer classes to message composer (as they include voice not just text) 2021-11-19 15:03:01 +00:00
Benoit Marty
35f9bef94a
Merge pull request #4515 from vector-im/feature/adm/voice-state
Voice recording UI state in ViewModel
2021-11-19 15:59:17 +01:00
Benoit Marty
5e99972d95 Remove dead code 2021-11-18 16:01:01 +01:00
Adam Brown
be685bc56a aligning the locked recording view to the send message button without the margin, fixes the layout jumping when the mic button switches to a send 2021-11-18 14:59:06 +00:00
Adam Brown
9ae03b76cd allows locking and cancelling to occur after choosing either option
- fixes other quirks caused by porting to the inverted display logic
2021-11-18 14:15:55 +00:00
Adam Brown
f0ef9e9706 inverting and splitting the voice message view into logic and views
- creates a display entry point which will be called externally
2021-11-18 14:15:55 +00:00
Benoit Marty
6f13fb1634 Create file for Toast style (more generic)
And improve fragment_create_poll.xml preview rendering
2021-11-15 14:23:32 +01:00
Benoit Marty
223b33fa65 Create CallToAction button style 2021-11-15 14:16:22 +01:00
Benoit Marty
2aab94acb4 Create dedicated file for TextInputLayout styles
And follow naming convention
2021-11-15 14:11:15 +01:00
Onuray Sahin
299d81fd18 Lint fix. 2021-11-15 14:41:22 +03:00
Onuray Sahin
a6c88b74a4 Hide poll icon from attachment type selector for now. 2021-11-11 13:42:04 +03:00
Onuray Sahin
a10253c003 Design review fixes. 2021-11-08 17:26:01 +03:00
Benoit Marty
b8ca520552
Make the poll option visible so that it can be tested from the PR 2021-11-02 16:34:44 +01:00
Onuray Sahin
40aa0175d0 Code review fixes. 2021-10-29 16:54:54 +03:00
Onuray Sahin
db820efc3a Fix UI issues. 2021-10-28 15:43:51 +03:00
Onuray Sahin
6cee266a95 Create poll UI implementation. 2021-10-27 13:10:01 +03:00
Onuray Sahin
cb1d5e888d Create poll fragment with a title. 2021-10-25 20:14:10 +03:00
Onuray Sahin
3e03db200c Add poll icon to attachment type selector. 2021-10-25 14:47:57 +03:00
Benoit Marty
085da6c99a
Merge pull request #4090 from vector-im/feature/aris/presence
Feature/aris/presence
2021-10-13 09:58:22 +02:00
Benoit Marty
6c915ea4d1 Cleanup the PR about presence 2021-10-12 16:45:41 +02:00
Benoit Marty
923bc00dcd
Merge branch 'develop' into feature/aris/presence 2021-10-12 15:22:40 +02:00
koh6uawi
c9f69b3fc5 Move XML namespaces to root element 2021-10-12 15:12:26 +02:00
koh6uawi
da28ddfabd Use "wrap_content" instead of "match_parent"
Fix a linter error
2021-10-12 15:10:33 +02:00
koh6uawi
1069e990e5
Merge branch 'vector-im:develop' into scroll_select_font_size 2021-10-11 00:19:46 +02:00
Benoit Marty
66d4a48930 Remove unused strings 2021-10-08 15:07:52 +02:00
koh6uawi
56b0b28d5e Make "Select text size" dialog scrollable
Wrap the LinearLayout inside a ScrollView.
2021-10-08 01:59:13 +02:00