8d37dc5118
Bump json from 20190722 to 20211205
...
Bumps [json](https://github.com/douglascrockford/JSON-java ) from 20190722 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases )
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md )
- [Commits](https://github.com/douglascrockford/JSON-java/commits )
---
updated-dependencies:
- dependency-name: org.json:json
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-18 23:08:02 +00:00
5ee4984ec8
Bubbles: handle images and make small refactoring
2022-01-18 19:27:12 +01:00
2dfded7326
Remove comment
2022-01-18 14:42:32 +01:00
a38a03c980
Use class from common module
2022-01-18 14:41:35 +01:00
1c42df7752
Move the file to the new module.
2022-01-18 14:39:02 +01:00
ffad479dad
Move the file to the new module.
2022-01-18 14:30:59 +01:00
194a584e4c
Merge branch hotfix/1.3.15
2022-01-18 14:21:09 +01:00
f0d5260be8
Fix unit test
2022-01-18 12:34:14 +01:00
2a7719cdf6
ktlint
2022-01-18 12:12:36 +01:00
bdd30e3b8f
Fix crash when viewing source which contains an emoji.
...
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
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
7ff8483592
Merge branch 'develop' into feature/fga/message_bubbles
2022-01-17 19:19:29 +01:00
81a1dfd66d
PR Remarks
2022-01-17 17:28:40 +02:00
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update
...
Updated splash carousel images and copy
2022-01-17 15:11:08 +00:00
f4cacb2d16
applying percentage based heights to the carousel hero image and paddings
2022-01-17 09:24:53 +00:00
c0b855e7c7
adding non light mode carousel background which uses a vertical gradient
2022-01-17 09:24:53 +00:00
1108ef9fbe
Bubbles: make it works for file, voice and polls. Also add parity for "modern" layout.
2022-01-14 19:19:23 +01:00
9a42e1e8c3
Move this class to the correct folder
2022-01-13 20:32:59 +01:00
b8aaa177c2
Add a module library/core-utils as a base module for all util tools
2022-01-13 20:28:50 +01:00
d06df45e85
Merge branch 'develop' into feature/fga/message_bubbles
2022-01-13 13:17:23 +01:00
b9cc795996
Bubbles : fix background colors
2022-01-13 12:33:36 +01:00
ce7a93bcae
locking phones to portait during the ftue auth onboarding flow
...
- uses a resource bucket flag for determining if the device is big enough to be considered a tablet and in turn, enable a landscape experience
2022-01-11 17:28:29 +00:00
3bd21d04d8
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
f7c9b36cef
Bubbles: continue exploration
2022-01-11 11:57:35 +01:00
bdb41b253d
flipping the gradient ftue background for rtl locales, fixes the gradient starting from the wrong side
2022-01-07 14:44:21 +00:00
50e51cbe29
Merge branch 'develop' into feature/aris/threads
2022-01-07 16:36:48 +02:00
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
785a142720
moving the carousel backgrounds to the ui-styles module
2022-01-07 11:17:39 +00:00
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
a2f780bef4
adding carousel content, images are temporary
2022-01-06 19:54:48 +00:00
ad63d3de1c
Bubbles: still R&D. Not sure how to handle every event types.
2022-01-06 19:07:28 +01:00
9e9b779186
moving the debug icon to the main source set
...
- the onboarding uses the icon and it can be displayed for developer mode users
2022-01-06 10:03:13 +00:00
bde1df0322
Bubbles: continue R&D on UI
2022-01-05 11:00:12 +01:00
e540b26112
Merge develop into feature/fga/message_bubbles
2022-01-04 15:13:42 +01:00
eb875823d5
Remove unused class and resource after new poll implementation
2022-01-04 13:02:17 +01:00
694b8de034
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
2022-01-03 11:08:22 +02:00
464ac3bce2
Fix blink effect when opening the attachment popup, and improve clickability of the buttons
2021-12-30 16:36:36 +01:00
acdd4e24b9
Merge tag 'v1.3.12' into sc
...
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10
Conflicts:
build.gradle
vector/build.gradle
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/helper/TimelineEventVisibilityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.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/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/drawable/highlighted_message_background.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_expandable_textview.xml
vector/src/main/res/layout/item_login_header.xml
vector/src/main/res/layout/item_radio.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_stub_room_profile_header.xml
vector/src/main/res/layout/view_url_preview.xml
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_root.xml
2021-12-23 14:36:13 +01:00
9a5934dd33
Bubbles: R&D try to find the best way to provide dynamic layout
2021-12-16 20:57:05 +01:00
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
a40e60ba8f
Merge branch 'develop' into feature/bma/posthog
2021-12-13 23:18:14 +01:00
e519e314fe
Limit width of content on tablets
2021-12-13 23:16:47 +01:00
004a51646b
Fix some more reaction colors on dark theme
...
Follow-up to 6048e1266984: Fix reaction color for non-emojis on dark theme
Hardcoding it to black is bad for dark themes. It was probably done
because the default color would make emojis look pale due to
transparency. If we use a primary text color which hopefully does not
feature transparency (it does not for SC themes, at least), everything
looks fine.
Change-Id: Icbc3b37f5535b98684c2225c0973a152e88d6b31
2021-12-13 09:15:37 +01:00
51756a9795
Message bubble as xml, and outlined bubble for notices
...
Change-Id: Ieb16e917456e2b8dd4fea9de8b88684be0c8bff4
2021-12-11 16:58:23 +01:00
0150d830d4
flattening preview url view layout with custom view to reduce view hierarchy
2021-12-07 11:32:50 +00:00
4b63a9f939
Merge tag 'v1.3.9' into sc
...
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861
Conflicts:
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/composer/VoiceMessageRecorderView.kt
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
d1bb96cec0
Threads notification badge UI
2021-12-03 11:30:30 +00:00
6cb8a2458f
Remove extra new lines in XML
2021-12-01 23:06:49 +01:00
6d3df0d802
Use `@id` and not `@+id` when referencing ids in layouts - ConstraintLayout
2021-12-01 22:13:21 +01:00
e15c84129c
Use same values than for light theme, for a better rendering
...
See https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998
2021-11-22 10:20:01 +01:00
c03c6867f7
Merge branch 'merge-v1.3.8' into sc
...
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38
Conflicts:
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
2021-11-17 20:26:27 +01:00
d9a5991559
Merge tag 'v1.3.8' into HEAD
...
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309
Conflicts:
dependencies.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
03b96a8a42
Update padding ( #4285 )
2021-11-16 16:33:28 +01:00
27d6e271ad
Add a debug layout to see social login buttons
...
For AS preview only
2021-11-16 16:33:04 +01:00
6f13fb1634
Create file for Toast style (more generic)
...
And improve fragment_create_poll.xml preview rendering
2021-11-15 14:23:32 +01:00
223b33fa65
Create CallToAction button style
2021-11-15 14:16:22 +01:00
2aab94acb4
Create dedicated file for TextInputLayout styles
...
And follow naming convention
2021-11-15 14:11:15 +01:00
6bca1bf18b
Change presence color to green for some accents
...
Closes https://github.com/SchildiChat/SchildiChat-android/issues/97
Change-Id: I31095c9677a5c00162d8cb2416a12c31ad77f372
2021-11-12 12:16:47 +01:00
a10253c003
Design review fixes.
2021-11-08 17:26:01 +03:00
c8d9e69c40
Fix presence theming
...
Change-Id: Ief37c2a6c3d1ed7270ec0a69da122b56614a2adf
2021-10-22 09:18:59 +02:00
978056e01f
Merge tag 'v1.3.4' into sc
...
Conflicts:
dependencies.gradle
gradle.properties
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/session/sync/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b 1f74bc986
2021-10-21 17:31:11 +02:00
9ab59a543d
* Implement Presence Service:
...
- Get Presence Status
- Set Presence Status
* Integrate presence in room details screen
* Integrate presence in room people's view
* Update UI to support presence
* Fix bug when insertOrUpdate was called on RoomMemberEventHandler and override the correct presence value in RoomMemberSummaryEntity
* Improve performance on updateUserPresence in RoomMemberSummaryEntity entity
* Remarks & linter fixes
* Disable presence when there is no m.presence events. In some servers like matrix.org is disabled atm.
* Enhance UI Presence on DM room lists to support dark/light theme
* Restore missing lines in gradle.properties to speed up debugging
2021-10-06 18:00:02 +03:00
0c7981dc26
Revert "Revert "Revert "Use Java 11 source code"""
...
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.
Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72
Conflicts:
attachment-viewer/build.gradle
library/ui-styles/build.gradle
matrix-sdk-android-rx/build.gradle
matrix-sdk-android/build.gradle
vector/build.gradle
2021-09-29 09:56:32 +02:00
4f93eb041c
Merge tag 'v1.3.0' into sc
...
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
b51bd743c7
Revert "Revert "Use Java 11 source code""
...
This will make the latest upstream merge easier.
This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
2021-09-29 09:13:59 +02:00
756529e565
Revert "Use Java 11 source code"
...
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.
Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.
This reverts commit 80f23f1f3c
2021-09-18 20:26:29 +02:00
744523b200
Merge pull request #4017 from vector-im/feature/aris/optimize_global_gradle_variables
...
Optimize dependencies handling
2021-09-17 15:28:49 +02:00
1dcf6b9539
Enhance dependencies handling to support Dependabot
2021-09-17 14:58:44 +03:00
932a43ef58
Add subspace action
2021-09-17 09:22:10 +02:00
d87c03c505
Theme mxid-based username colors
...
TODO for follow-up commit: same for mxid-based room colors (maybe with
an extra setting?)
Change-Id: I827bd967e615f20e12f205c0ae5b24a777e90d45
2021-09-16 09:04:13 +02:00
c89b2c0536
Optimize dependencies handling
2021-09-15 13:21:25 +03:00
1b8874e8cb
Expose and theme some upstream colors concerning video conferences
...
Change-Id: I8ed960c119c2b87a9e8af0bce60bbf60034f5a61
2021-09-10 12:26:56 +02:00
133579d066
Merge tag 'v1.2.1' into sc
...
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a
Conflicts:
build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/composer/VoiceMessageRecorderView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
2021-09-09 10:51:12 +02:00
5a5d4fda2d
DSL value has shorter alias now
2021-09-09 09:55:24 +02:00
529a7aedcb
Cleanup useless values
2021-09-09 09:55:24 +02:00
b985092613
Fix lint issues
2021-09-02 10:36:29 +02:00
80f23f1f3c
Use Java 11 source code
...
https://developer.android.com/studio/releases/gradle-plugin#java-11
2021-09-02 09:50:34 +02:00
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
4518962658
New voip design: clean after benoit review
2021-08-26 11:08:34 +02:00
1d767d6e3f
Fix keyword style, preference persistence and add comment to keyword ruleid
2021-08-25 17:38:12 +01:00
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
1f64afd6bc
Fix crash for SC dark theme when trying to remove rooms from spaces
...
Change-Id: I835bc1e1f3ba96ebb8e5d39af2cbb722b821b609
2021-08-22 11:20:31 +02:00
b8b4ddf0d1
Fix light/dark confusion
...
Change-Id: I3f7a5df9cc202094d5b307dee0b1f99427c7a09e
2021-08-22 11:20:08 +02:00
387459ae6b
Fix material alert dialog brightening up the desired background color
...
Change-Id: I0b805d1605d80765631fdf093ed645b5be35c57b
2021-08-18 12:07:44 +02:00
bcc9a75bdb
Merge branch 'develop' into feature/fga/new_voip_design
2021-08-11 12:37:54 +02:00
1590740981
Properly theme verification request popup background
...
Change-Id: Ia613b9cb6efe41a54cb9ec049828aac27f0968c7
2021-08-10 10:09:40 +02:00
8d7e3b6544
add keyword checkbox preference and chip/edit text for modificying keywords
2021-08-03 09:52:36 +01:00
6399e71e25
[merge-features] Fix and properly style voice message recording for SC
...
Change-Id: Iba97f334b07e0fa1f4a4cc8fc92c97e53d919dd4
2021-08-01 11:42:17 +02:00
3959a838d1
[merge-features] Fix voice messsage bubble layout + SC themes
...
Change-Id: Idd2dddc8c8f6333ca90fa5411c69e084e3a4cdcf
2021-08-01 10:31:17 +02:00
25ba52115b
Merge tag 'v1.1.15' into sc
...
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4
Conflicts:
vector/src/main/assets/open_source_licenses.html
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
...
Voice Message
2021-07-30 17:24:17 +03:00
4c8a8d8cfb
Design review fixes.
2021-07-27 15:32:35 +03:00
abccf99f55
Theme color of quotation bar
...
Change-Id: Ia9d9c34c1bb276fea42b00131ea1915f93f23263
2021-07-25 10:34:27 +02:00
3e95246908
Update light bottomsheet dialog style
...
Change-Id: Ic36059e93146eff2031dbd626cbe14f1ccfdf493
2021-07-25 10:18:16 +02:00
e785bcc1f1
Tweak accents
...
Change-Id: I3ccb799dd430c56fd4d27ef307618e255773d5fa
2021-07-25 10:02:53 +02:00
ac4fe57995
Add some more accents
...
Imported from AICP
Change-Id: Icce1c1d602bdf8a9d762448801df5cf57b221e60
2021-07-24 17:57:41 +02:00
d54a9302fc
Accent color theming
...
Change-Id: I31b19858d0e01e1427df91750875bc470e741bcd
2021-07-24 17:42:05 +02:00
acb12c2005
Merge tag 'v1.1.14' into sc
...
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2021-07-24 10:12:48 +02:00
4788630949
Merge branch 'develop' into feature/fga/new_voip_design
2021-07-23 12:17:05 +02:00
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
...
Bumps appcompat from 1.3.0 to 1.3.1.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00:00
8d0c133dde
Theme code backgrounds in markdown
...
Change-Id: Ia37dc51961e990e5b7a2c9c6890da01bcf076dd6
2021-07-21 13:02:20 +02:00
8497a307a1
Merge tag 'v1.1.13' into sc
...
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-07-19 16:10:57 +02:00
6caa2b9ae0
Fix issue with RTL
...
Still a pb when Mic is on, margins are not correct
2021-07-16 17:12:08 +02:00
95bb796bad
Fix color
2021-07-13 17:19:11 +02:00
9e0f3a1517
Fix other color issue
2021-07-13 16:17:22 +02:00
cf4e603f09
Fix background color of voice message recorder
2021-07-13 16:14:02 +02:00
6530440069
Fix an issue in the color
2021-07-13 16:12:54 +02:00
14dbbee1e3
Fix background color of voice message item
2021-07-13 16:10:51 +02:00
4c5be39f46
Fix background color of Play/Pause button
2021-07-13 16:08:54 +02:00
15249ebe1b
Some RTL/LTR mixture alignment improvements
...
Change-Id: I2174b75f378cd09290d9d32bd39ebf15e577ab23
2021-07-11 12:24:29 +02:00
e391a1371c
Merge branch 'develop' into feature/ons/voice_message
2021-07-09 22:19:50 +02:00
2c1335a2f5
Theme for Toast
2021-07-09 21:06:13 +02:00
7a1c6b78d4
Move the style to the layout, for code clarity. Style are not reused, and it's better to have layout attr in the layout itself
2021-07-09 17:49:27 +02:00
558cd6f376
Cleanup
2021-07-09 17:18:56 +02:00
7d377ea418
Change power level username colors
...
Change-Id: If49dbc83268f04bba923838eda1fb7aa461c23cd
2021-07-08 20:11:45 +02:00
7a1b138894
Merge branch 'develop' into feature/ons/voice_message
...
* develop: (286 commits)
Fix crash after video call
Fix issue on button styles
Clean after benoits review
Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
Bump kotlin_version from 1.5.10 to 1.5.20
Bump libphonenumber from 8.12.25 to 8.12.26
Fix call invite processed after call is ended because of fastlane mode.
Jump to unread: removes unnecessary check which can cause scroll issue
Jump to unread: avoid blink when jumping
Clean after Benoits review
Delete unused drawable to avoid conflict on develop
Jump to unread: add towncrier file.
Read marker: fix some issues with jump to unread visibility.
Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
Reordering
Add text style for dialogs
Colored dialog button is now handled by the theme
Update theme for material dialog and create a destructive variant
Reorder buttons
Update doc
...
# Conflicts:
# library/ui-styles/src/main/res/values/theme_dark.xml
# library/ui-styles/src/main/res/values/theme_light.xml
# vector/build.gradle
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/composer/TextComposerView.kt
# vector/src/main/res/values/strings.xml
2021-07-06 13:17:49 +03:00
566feaecc1
Make jump to unread better visible for SC dark theme
...
Change-Id: I9c95ab4348f4b4c2c77056b81a0e3de585d56cb0
2021-07-06 10:14:47 +02:00
cdf97fc29f
Merge branch 'develop' into feature/fga/new_voip_design
2021-07-05 18:02:19 +02:00
0b8b9d3cad
Fix jump-to-unread style for non-Element themes
...
Change-Id: If203eb8af60542eff57269dfe318b754b1e83b10
2021-07-05 18:00:51 +02:00
37b729c1d1
Remove freshly added corner radius from Element
...
Change-Id: I966aeb01b0fdfd30f03b601beefa049d92a6b3ac
2021-07-05 16:59:52 +02:00
e5c9c33a0f
Merge tag 'v1.1.12' into sc
...
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236
Conflicts:
library/ui-styles/src/main/res/values/text_appearances.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
2021-07-05 16:58:45 +02:00
24a61ee0ff
Display-name coloring setting
...
Based on whether a chat is
- DM
- Room
- Public room
allow to select whether to color usernames
- Uniformly (as previously done in SC themes)
- Based on Matrix ID (as previously seen in Element themes)
- Based on the user's power level in that room (new!)
The setting concerning rooms that are neither DM nor public is also used
for deciding whether to use mxid-based avatar coloring or uniform
coloring.
Change-Id: Ic68a24f4818a193f776a3b14232f887cd229929a
2021-07-04 17:01:27 +02:00
9ff1e20f07
Bump material from 1.3.0 to 1.4.0
...
Bumps [material](https://github.com/material-components/material-components-android ) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases )
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0 )
---
updated-dependencies:
- dependency-name: com.google.android.material:material
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-02 23:07:53 +00:00
f74a71001a
Change active call bar + some minor changes in call screen
2021-07-01 20:05:58 +02:00
4e9ab0c6f9
Fix message highlight color behind bubbles for SC themes
...
Change-Id: Ia115cba593c90682bbf4023d9161b1df6001f3c9
2021-06-29 16:46:23 +02:00
559016cd32
SC theme improvements after merge, pt. 3
...
Change-Id: I506d0bc3a320508268646ba86d93fb39e2ad8168
2021-06-29 15:06:45 +02:00
dab04d52fd
More SC theme improvements, including a reworked light theme
...
Change-Id: I373daedc45bee3aa9e24e09bb632b01e27754010
2021-06-28 18:28:41 +02:00
bca220f909
Fix issue on button styles
2021-06-28 17:02:06 +02:00
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign
...
Jump to unread: implement new design
2021-06-28 16:45:06 +02:00
098d98926a
Fixup SchildiChat theming
...
Change-Id: I0c6f04ceb4c09be41d5879b6c6a4cee1d082c525
2021-06-27 12:01:35 +02:00
cd0c9b4e08
Merge pull request #3549 from vector-im/feature/bma/cleanup_styles
...
Fix styles issue
2021-06-25 19:11:54 +02:00
1ba97fa9be
Clean after Benoits review
2021-06-24 17:40:45 +02:00
89ef62e1d5
Fix compile after v1.1.10 merge
...
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
2021-06-24 10:19:02 +02:00
885f5736c9
Stop using ProgressDialog, there is a theme issue with it.
...
It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
2021-06-23 16:46:15 +02:00
43cad8751d
Reordering
2021-06-23 16:12:38 +02:00
9ac0f6d86b
Add text style for dialogs
2021-06-23 15:38:01 +02:00
11b16ea065
Colored dialog button is now handled by the theme
2021-06-23 14:50:34 +02:00
72aa4bb999
Merge tag 'v1.1.10' into sc
...
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab
Conflicts:
library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
library/ui-styles/src/main/res/drawable/splash.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/drawable/ic_attachment.xml
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/drawable/ic_keyboard.xml
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_user_list.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_space_beta_header.xml
vector/src/main/res/layout/item_suggested_room.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values/styles_riot.xml
2021-06-23 13:38:41 +02:00
67bdb75d80
Update theme for material dialog and create a destructive variant
2021-06-23 13:19:14 +02:00
121fd9a19d
Jump to unread: implement new design
2021-06-22 16:29:19 +02:00
ed97cf7dac
Create dimens for text sizes
2021-06-22 14:39:24 +02:00
6289d640b4
Reveal password: use facility from com.google.android.material.textfield.TextInputLayout instead of manual handling
...
Also avoid repeating password on the change password dialog.
2021-06-22 11:31:45 +02:00
4ce71c8487
Create a style for password edit
2021-06-18 21:52:53 +02:00
9f101423e2
Add some TextViews
2021-06-18 15:08:51 +02:00
a619b0141a
Rename file
2021-06-18 15:02:18 +02:00
1ffe57ce94
Change vctr_header_background alias from vctr_content_quinary to vctr_system
2021-06-18 13:27:21 +02:00
9f96974e67
Rename some theme to follow naming convention
2021-06-18 10:25:37 +02:00
1a898f0404
Rename themes follow Android conventions
2021-06-16 12:34:14 +02:00
ece9d19d8c
Rename again the style to follow Android convention (G's review)
2021-06-16 11:59:08 +02:00
d7884fe4d2
Add doc and fix a small mistake on style
2021-06-16 10:40:22 +02:00
5e9b4e77bf
Rename a last time some style: M -> Medium
2021-06-16 09:02:03 +02:00
858bbfd8d2
Rename style to follow naming conventions
...
And move some files to the module
2021-06-15 21:37:27 +02:00
0590acd31a
Fix crash on default theme
2021-06-15 20:23:37 +02:00
a67f8ca4dc
Add some missing style. Default is not workong (?)
2021-06-15 19:00:07 +02:00
06cbbbe1e8
Fix errors
2021-06-15 18:40:58 +02:00
b3a547cd87
Move and rename some files
2021-06-15 18:36:09 +02:00
9c9d0a5d21
Add dep on ui_style to attachment viewer
2021-06-15 18:22:26 +02:00
bbbe76b91c
Move test style Activity and layout to the new ui-style module
2021-06-15 18:17:36 +02:00
000b524b34
Move style and theme to the dedicated module
2021-06-15 12:39:39 +02:00
f5f09224b1
Create module for ui-styles
2021-06-15 12:23:54 +02:00
dependabot[bot]
ganfra
Benoit Marty
Benoit Marty
ariskotsomitopoulos
Adam Brown
SpiritCroc
Onuray Sahin
Valere
David Langley
Onuray Sahin