diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt index 6e879df7ab..63a3fad109 100644 --- a/tools/check/forbidden_strings_in_code.txt +++ b/tools/check/forbidden_strings_in_code.txt @@ -164,7 +164,7 @@ Formatter\.formatShortFileSize===1 # android\.text\.TextUtils ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt -enum class===82 +enum class===83 ### Do not import temporary legacy classes import org.matrix.android.sdk.internal.legacy.riot===3 diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt index d4dfbade7f..0ad831057a 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt @@ -277,7 +277,6 @@ class RoomProfileFragment @Inject constructor( } } - override fun onImageReady(image: MultiPickerImageType) { val destinationFile = File(requireContext().cacheDir, "${image.displayName}_edited_image_${System.currentTimeMillis()}") val uri = image.contentUri diff --git a/vector/src/main/res/layout/item_editable_avatar.xml b/vector/src/main/res/layout/item_editable_avatar.xml index 3b560dd65f..8b1826dbe2 100644 --- a/vector/src/main/res/layout/item_editable_avatar.xml +++ b/vector/src/main/res/layout/item_editable_avatar.xml @@ -39,7 +39,7 @@ android:id="@+id/itemEditableAvatarDelete" android:layout_width="32dp" android:layout_height="32dp" - android:background="@drawable/circle" + android:background="@drawable/header_panel_round_background" android:scaleType="center" android:src="@drawable/ic_delete" android:visibility="gone"