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
SpiritCroc
Benoit Marty
ariskotsomitopoulos
Valere
Benoit Marty
ganfra
David Langley
Onuray Sahin
Onuray Sahin
dependabot[bot]