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
Benoit Marty
f2165201eb
Remove unused module matrix-sdk-android-rx and do some cleanup
2022-01-13 17:54:25 +01:00
ariskotsomitopoulos
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
Benoit Marty
ae8d1d1429
Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
2022-01-10 15:10:08 +01:00
ariskotsomitopoulos
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
dependabot[bot]
7661d217ee
Bump org.jlleitschuh.gradle.ktlint from 10.2.0 to 10.2.1
...
Bumps org.jlleitschuh.gradle.ktlint from 10.2.0 to 10.2.1.
---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-27 23:06:36 +00:00
ariskotsomitopoulos
5723465106
Fix local notification badge number
2021-12-17 01:23:09 +02:00
ariskotsomitopoulos
a187e0ec33
Enhance thread awareness to recognise the type of messages that are not able to be send as a reply such as images, videos, audios, stickers
2021-12-16 22:03:42 +02: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
Benoit Marty
7c2ed46dd7
Remove jcenter from here, let's see what the CI will say
2021-12-10 21:40:32 +01:00
Benoit Marty
a71f2415a6
Common struct for each maven repo
2021-12-10 21:35:48 +01:00
Benoit Marty
45ff069d66
Rename the file to group them
2021-12-10 21:19:43 +01:00
ariskotsomitopoulos
c514a3b063
Enhance include groups implementation by decoupling them to a separate file
2021-12-10 19:09:14 +02:00
Benoit Marty
1267468704
Add missing dependency for ktlint
2021-12-10 00:04:10 +01:00
Benoit Marty
b1f78004cf
Add comment
2021-12-09 23:59:16 +01:00
Benoit Marty
0df11fc145
Remove unused dependency videocache
2021-12-09 23:47:04 +01:00
Benoit Marty
29837d48fe
Alerter is now on Jitpack
2021-12-09 23:39:22 +01:00
Benoit Marty
f69f303246
Add missing dependency to compile Android tests
2021-12-09 23:23:12 +01:00
Benoit Marty
c32c0f8d7d
Add missing dependency to run lint
2021-12-09 23:11:54 +01:00
Benoit Marty
3604b1cc63
Add explicit dependency location for mavencentral
2021-12-09 22:16:20 +01:00
Benoit Marty
61625095cf
Cleanup
2021-12-09 21:48:00 +01:00
Benoit Marty
ced159b1b1
Add explicit dependency location for google
2021-12-09 21:41:37 +01:00
Benoit Marty
2b6618ab40
Add explicit dependency location for jitsi
2021-12-09 21:23:33 +01:00
Benoit Marty
abfaa03a1e
Add explicit dependency location for jitpack.io
2021-12-09 21:16:23 +01:00
Benoit Marty
934d325c2a
Add explicit dependency location for olm library
2021-12-09 21:05:31 +01:00
Benoit Marty
101f3229c2
Add explicit dependency location for jcenter
2021-12-09 21:03:36 +01:00
Benoit Marty
892d70812f
Upgrade OLM to v3.2.7 and get it from our maven repository.
2021-12-07 14:50:25 +01:00
Benoit Marty
e233915c0f
Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0
2021-11-18 15:58:40 +01:00
ariskotsomitopoulos
8c539426e6
- Thread Summary along with optimization
...
- Create new thread & reply to thread
2021-11-15 19:17:13 +02:00
ganfra
ff53cf4db9
Hilt: replace the VectorComponent
2021-10-14 18:47:28 +02:00
dependabot[bot]
b7f0efbeb1
Bump org.jlleitschuh.gradle.ktlint from 10.1.0 to 10.2.0
...
Bumps org.jlleitschuh.gradle.ktlint from 10.1.0 to 10.2.0.
---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 23:06:54 +00:00
Benoit Marty
03bdcee3ad
Install ktlint plugin
2021-10-01 13:31:15 +02:00
ariskotsomitopoulos
c89b2c0536
Optimize dependencies handling
2021-09-15 13:21:25 +03:00
Benoit Marty
d773fb4135
Also upgrade kotlin_coroutines_version to 1.5.1
2021-09-08 22:39:37 +02:00
dependabot[bot]
13878c8e7e
Bump kotlin_version from 1.5.21 to 1.5.30
...
Bumps `kotlin_version` from 1.5.21 to 1.5.30.
Updates `kotlin-gradle-plugin` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30 )
Updates `kotlin-stdlib-jdk7` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30 )
Updates `kotlin-stdlib` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-08 22:39:20 +02:00
Benoit Marty
9a0f38455a
Add link to the release notes
2021-09-02 09:36:13 +02:00
dependabot[bot]
f0f778e872
Bump gradle from 4.2.2 to 7.0.2
...
Bumps gradle from 4.2.2 to 7.0.2.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 23:09:57 +00:00
ganfra
42bfa129b3
Merge branch 'develop' into feature/fga/new_voip_design
2021-08-24 16:21:35 +02:00
ganfra
bcc9a75bdb
Merge branch 'develop' into feature/fga/new_voip_design
2021-08-11 12:37:54 +02:00
dependabot[bot]
aedb4bde74
Bump google-services from 4.3.8 to 4.3.10
...
Bumps google-services from 4.3.8 to 4.3.10.
---
updated-dependencies:
- dependency-name: com.google.gms:google-services
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-09 23:06:44 +00:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
...
Voice Message
2021-07-30 17:24:17 +03:00
ganfra
4788630949
Merge branch 'develop' into feature/fga/new_voip_design
2021-07-23 12:17:05 +02:00
dependabot[bot]
2afac82c81
Bump kotlin_version from 1.5.20 to 1.5.21
...
Bumps `kotlin_version` from 1.5.20 to 1.5.21.
Updates `kotlin-gradle-plugin` from 1.5.20 to 1.5.21
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.21/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.21 )
Updates `kotlin-stdlib-jdk7` from 1.5.20 to 1.5.21
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.21/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.21 )
Updates `kotlin-stdlib` from 1.5.20 to 1.5.21
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.21/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.21 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 23:08:48 +00:00
Benoit Marty
e391a1371c
Merge branch 'develop' into feature/ons/voice_message
2021-07-09 22:19:50 +02:00
Onuray Sahin
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
ganfra
cdf97fc29f
Merge branch 'develop' into feature/fga/new_voip_design
2021-07-05 18:02:19 +02:00
ganfra
f74a71001a
Change active call bar + some minor changes in call screen
2021-07-01 20:05:58 +02:00
Onuray Sahin
5676226f42
Voice message recording view implementations.
2021-07-01 10:47:41 +03:00
dependabot[bot]
1ae88afcda
Bump gradle from 4.2.1 to 4.2.2
...
Bumps gradle from 4.2.1 to 4.2.2.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:09:18 +00:00
dependabot[bot]
b1a1b4651e
Bump kotlin_version from 1.5.10 to 1.5.20
...
Bumps `kotlin_version` from 1.5.10 to 1.5.20.
Updates `kotlin-gradle-plugin` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20 )
Updates `kotlin-stdlib-jdk7` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20 )
Updates `kotlin-stdlib` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-24 23:09:29 +00:00