Commit graph

1329 commits

Author SHA1 Message Date
ariskotsomitopoulos
bac6d271ca Merge develop into this branch 2022-01-27 18:13:05 +02: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
554ece724e - Remove counter from thread notifications
- Fix red dot on user mentioning
2022-01-27 14:55:34 +02:00
Benoit Marty
6107fb644d Flatten View hierarchy 2022-01-26 17:00:36 +01:00
Benoit Marty
793cdf8f87 Ensure mapbox legal mention are displayed on the map 2022-01-26 00:22:07 +01:00
Adam Brown
523f4eeabf using material card view instead of androidx cardview 2022-01-25 18:15:32 +00:00
Benoit Marty
f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location
Static Location Sharing
2022-01-25 18:03:17 +01:00
Benoit Marty
bca65281b6
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode
Updating use case icons to match designs
2022-01-25 16:06:40 +01:00
Benoit Marty
b728e062e3 Cleanup layout 2022-01-25 15:15:47 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Benoit Marty
5bb06158c7
Merge pull request #5020 from vector-im/feature/ons/edit_polls
Edit Polls and Allow Undisclosed Polls
2022-01-25 13:47:49 +01:00
Benoit Marty
3bc7b0acee Small issue 2022-01-24 18:57:53 +01:00
Adam Brown
203c7e0cd7 adding tools preview for the use case option icons
- this is only the background layer though as the real image is programatically constructed
2022-01-24 17:55:46 +00:00
Benoit Marty
3a8c788657 Add a Flow to ba able to hide one of the button 2022-01-24 18:47:26 +01:00
Onuray Sahin
12bfece89e Prevent anr in timeline. 2022-01-24 17:36:26 +03:00
Onuray Sahin
b0b92c062e Undisclosed poll implementation. 2022-01-24 14:31:50 +03:00
Adam Brown
023409d8cf updating use case icons to match designs
- programmatically creates a layer drawable to avoid introducing new colours into the palette
2022-01-21 17:16:49 +00:00
fedrunov
f7aedff418
toolbar management (#4887)
Toolbar management rework and toolbar style alignment
2022-01-21 13:38:27 +01:00
Adam Brown
3c7f2c5bdf adding tools:text for dynamically set text 2022-01-19 11:18:54 +00:00
Adam Brown
211f184066 updating splash submit copy to use Create account when the I already have an account feature is enabled 2022-01-19 10:38:28 +00:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.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/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown
f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown
b137009e6e replacing onboarding vectors with png to avoid performance overheads
- also fixes the carousel text reposition based on line count
2022-01-17 09:24:53 +00:00
Adam Brown
689c817606 updating splash carousel images with latest designs 2022-01-17 09:24:53 +00:00
ariskotsomitopoulos
3a3cce85f8 Add encryption shield
Change thread list filtering UI tick to radio buttons
2022-01-14 18:42:57 +02:00
ariskotsomitopoulos
ff87f07f65 Add empty screen UI on empty thread list 2022-01-14 15:11:20 +02:00
ariskotsomitopoulos
53b82dfa3f Fix permalink handling for threads regarding timeline changes 2022-01-14 13:02:08 +02:00
Adam Brown
a208b48c15
Merge pull request #4927 from vector-im/feature/adm/ftue-usecase
FTUE Use case UI/UX
2022-01-13 14:48:49 +00:00
Adam Brown
b371e24d9f wrapping the use case into a scrollview to avoid overlapping on smaller devices 2022-01-13 12:00:59 +00:00
Adam Brown
1f876b9088 adding text to design preview for programatically set text 2022-01-13 10:39:34 +00:00
Adam Brown
47c9e75a77 making the text only buttons a button widget to give them touch feedback 2022-01-13 10:36:42 +00:00
Onuray Sahin
ae8ca5356f Fix recyclerview issues on async map functions. 2022-01-12 15:14:13 +03:00
Adam Brown
0ba6f55ad4 aligning the use case image padding to the other onboarding pages 2022-01-12 12:06:10 +00:00
Adam Brown
3d4caeaa75 extracting use case copy to the resources 2022-01-12 12:06:10 +00:00
Adam Brown
b6ff6aa4cc adding barebones ftue use case fragment 2022-01-12 12:06:10 +00:00
ariskotsomitopoulos
753e3e7519 - fix ktlint format
- Update Threads toolbar UI
2022-01-11 15:31:21 +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
Valere
5cbb1d99c7 Code review 2022-01-10 17:38:35 +01:00
Valere
ff4bbf0a8a Add "Create room" shortcut in Explore Space screen 2022-01-10 17:00:32 +01:00
ariskotsomitopoulos
50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
Adam Brown
28f6d10af9
Merge pull request #4727 from vector-im/feature/adm/splash-carousel
FTUE Splash carousel MVP
2022-01-07 13:36:39 +00: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
b852b9de9c
Merge pull request #4871 from vector-im/feature/nfe/qr_scanner_toolbar
Toolbar is added to a views with QR code scan
2022-01-06 20:55:06 +01:00
Adam Brown
6929c947b0 adding gradient backgrounds to the carousel pages
- also coverts the carousel pages to constraint layout and makes use of gutters to provide percentage based sizing
2022-01-06 19:54:48 +00:00
Adam Brown
a2f780bef4 adding carousel content, images are temporary 2022-01-06 19:54:48 +00:00
Adam Brown
955fb03532 adding barebones splash carousel fragment, based on feature flag 2022-01-06 19:54:48 +00:00
Adam Brown
16ed3f799f adding I already have an account functionality to the ftue auth splash 2022-01-06 17:50:13 +00:00