mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 11:59:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

Increase version of uCrop library which supports Android 10.

Browse source
This commit is contained in:
Onuray Sahin 2020-08-26 12:27:12 +03:00
parent f745e22a52
commit 776d892d27
5 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -9,6 +9,7 @@ Improvements 🙌:
Bugfix 🐛: Bugfix 🐛:
- Display name not shown under Settings/General (#1926) - Display name not shown under Settings/General (#1926)
- Change user or room avatar: when selecting Gallery, I'm not proposed to crop the selected image (#1590)
Translations 🗣: Translations 🗣:
- -

2
vector/build.gradle
View file

@ -378,7 +378,7 @@ dependencies {
implementation "com.github.bumptech.glide:glide:$glide_version" implementation "com.github.bumptech.glide:glide:$glide_version"
kapt "com.github.bumptech.glide:compiler:$glide_version" kapt "com.github.bumptech.glide:compiler:$glide_version"
implementation 'com.danikula:videocache:2.7.1' implementation 'com.danikula:videocache:2.7.1'
implementation 'com.github.yalantis:ucrop:2.2.4' implementation 'com.github.yalantis:ucrop:2.2.6'
// Badge for compatibility // Badge for compatibility
implementation 'me.leolin:ShortcutBadger:1.1.22@aar' implementation 'me.leolin:ShortcutBadger:1.1.22@aar'

4
vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
View file

@ -144,9 +144,7 @@ class BigImageViewerActivity : VectorBaseActivity() {
.get(MultiPicker.IMAGE) .get(MultiPicker.IMAGE)
.getSelectedFiles(this, requestCode, resultCode, data) .getSelectedFiles(this, requestCode, resultCode, data)
.firstOrNull()?.let { .firstOrNull()?.let {
// TODO. UCrop library cannot read from Gallery. For now, we will set avatar as it is. onRoomAvatarSelected(it)
// onRoomAvatarSelected(it)
onAvatarCropped(it.contentUri)
} }
} }
UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) } UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }

4
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
View file

@ -301,9 +301,7 @@ class RoomProfileFragment @Inject constructor(
.get(MultiPicker.IMAGE) .get(MultiPicker.IMAGE)
.getSelectedFiles(requireContext(), requestCode, resultCode, data) .getSelectedFiles(requireContext(), requestCode, resultCode, data)
.firstOrNull()?.let { .firstOrNull()?.let {
// TODO. UCrop library cannot read from Gallery. For now, we will set avatar as it is. onRoomAvatarSelected(it)
// onRoomAvatarSelected(it)
onAvatarCropped(it.contentUri)
} }
} }
UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) } UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }

3
vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
View file

@ -356,8 +356,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
.get(MultiPicker.IMAGE) .get(MultiPicker.IMAGE)
.getSelectedFiles(requireContext(), requestCode, resultCode, data) .getSelectedFiles(requireContext(), requestCode, resultCode, data)
.firstOrNull()?.let { .firstOrNull()?.let {
// TODO. UCrop library cannot read from Gallery. For now, we will set avatar as it is. onAvatarSelected(it)
onAvatarCropped(it.contentUri)
} }
} }
UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) } UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }