Commit graph

114 commits

Author SHA1 Message Date
ariskotsomitopoulos
6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements
# Conflicts:
#	vector/src/main/res/menu/menu_timeline.xml
2022-04-05 16:32:49 +03:00
ericdecanini
bfd31de05e Renames call option to be more agnostic 2022-03-22 17:56:07 +01:00
ariskotsomitopoulos
f8e7ba7355 Format menu_timeline 2022-03-22 18:43:01 +02:00
ariskotsomitopoulos
b1c4ca7816 Simplify thread timeline toolbar menu more 2022-03-22 18:03:49 +02:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Maxime Naturel
4fe3b409d2 Replacing the search icon by a filter icon 2022-02-17 10:27:59 +01:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Onuray Sahin
9ea30445ef Merge branch 'develop' into feature/ons/static_location
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
2022-01-11 14:42:11 +03:00
ariskotsomitopoulos
ac5caccdf9 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Benoit Marty
185afe403f Rename some string resources 2022-01-04 14:25:36 +01:00
Onuray Sahin
a0afab45fb Show location preview and allow to share with external apps. 2021-12-27 14:03:59 +03:00
ariskotsomitopoulos
cd95fc41e4 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.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/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
#	vector/src/main/res/layout/fragment_room_detail.xml
2021-12-14 20:18:54 +02:00
ariskotsomitopoulos
d1bb96cec0 Threads notification badge UI 2021-12-03 11:30:30 +00:00
ariskotsomitopoulos
722f367690 View all threads screen implementation & UI
Add user friendly message thread summary on the SDK side
Fix not encrypted rooms thread summaries
2021-11-23 13:34:24 +02:00
ariskotsomitopoulos
586b3d8caa - Add specific toolbar for threads
- Renamed RoomDetailFragment to TimelineFragment while it should be reused from threads
 - View root thread message in room functionality
2021-11-22 14:02:17 +02:00
Adam Brown
06d4ee9df8 adding missing tints to the dev tools toolbar 2021-11-03 16:12:39 +00:00
ariskotsomitopoulos
ab87937e5b Threads init commit 2021-10-20 18:39:59 +03:00
ryg-git
7d911fff17 Focus on search bar when opening reaction view 2021-09-27 22:41:34 +05:30
ganfra
3119de42fb Fix memory leak on RoomDetailFragment 2021-09-08 16:47:53 +02:00
ganfra
e259b44449 Jitsi conf: show join button 2021-07-27 16:41:23 +02:00
ganfra
4b347bb48e Call design: make changes on toolbar menu 2021-07-01 20:44:17 +02:00
ganfra
7c033b4090 Call UI: add toolbar 2021-06-30 18:08:44 +02:00
Benoit Marty
9b215d2df6 Fix color error for top right menu 2021-06-16 16:58:55 +02:00
Benoit Marty
1d356cd49d Fix some issue on menu icon colors 2021-06-16 11:34:27 +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
047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00
ganfra
771b9b8d78 Dial pad tab: second step, add to home 2021-06-02 19:43:39 +02:00
Benoit Marty
cbed1afaaa Add custom server 2021-05-27 14:05:34 +02:00
Valere
0d0b6a8810 Fix empty states for spaces 2021-05-21 11:32:34 +02:00
Valere
f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +02:00
Valere
8146d8ab1e Add Rooms to space 2021-04-28 11:15:58 +02:00
Onuray Sahin
f5f16fd330 Retry and delete options added for all failed messages. 2021-03-10 11:10:23 +01:00
Benoit Marty
649edffa30 Hide menu if not in developer mode 2021-02-23 10:31:19 +01:00
Benoit Marty
c938795576 Read init sync to a file and split into smaller files to handle it 2021-02-23 10:31:19 +01:00
Valere
e5da026f1f Dev tools initial commit 2021-02-10 10:17:19 +01:00
Valere
c2027be0ee Fix audit freeze, add export, and buffer gossip saves 2020-10-29 12:55:26 +01:00
Benoit Marty
b78dac20c0 Room profile: BigImageViewerActivity now only display the image. Use the room setting to change or delete the room Avatar 2020-10-28 11:22:37 +01:00
Graeme Power
013cc53cc0 Make edit image and remove image icons visible in attachments preview menu
Signed-off-by: Graeme Power <gjpower@tcd.ie>
2020-10-27 17:40:27 +01:00
Benoit Marty
3276da3912 Fix submit title 2020-10-22 10:25:53 +02:00
Valere
47746d6997 Add event sender in app thread 2020-10-20 21:41:48 +02:00
Onuray Sahin
f82aee6089 Add fab to the member list screen to invite users. 2020-10-12 13:35:34 +03:00
Benoit Marty
ae3c453f35 Add a menu item in the timeline as a shortcut to invite user (#2171) 2020-10-05 10:10:55 +02:00
Benoit Marty
6f2736566e Add a menu item to open the setting in room list and in room (#2171) 2020-10-05 10:00:00 +02:00
Onuray Sahin
0838cbaf03 UI fixes. 2020-10-01 14:50:29 +02:00
Onuray Sahin
fc18a7b877 Add search action as the menu item inside the timeline 2020-10-01 14:48:55 +02:00
Valere
42a24300a1 Initial commit jitsi 2020-08-14 09:31:24 +02:00
Benoit Marty
0159e6dc00 Hide the menu item, it's not implemented yet 2020-07-15 14:33:01 +02:00
Benoit Marty
8f7aae4980 Tint the icon (#1613) 2020-07-15 14:33:01 +02:00
Valere
5e81ce8e3e Update tmp lab icon for notif tab 2020-07-13 19:25:35 +02:00