forked from element-hq/element-android
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Experimental: Allow sending custom emotes ("emojis")
Using MSC2545 image packs TODO: - not use pills, or make them look differently here? - edits and drafts lose it note: upstream issue, same for user pills Change-Id: I27daf5835e32b818e512b61b57c09bea8c205e94
- Loading branch information
1 parent
7f9a3df
commit fd34eba
Showing
14 changed files
with
181 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EmoteImage.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package org.matrix.android.sdk.api.session.room.model | ||
|
||
import com.squareup.moshi.Json | ||
import com.squareup.moshi.JsonClass | ||
import org.matrix.android.sdk.api.session.room.model.message.ImageInfo | ||
|
||
@JsonClass(generateAdapter = true) | ||
data class EmoteImage( | ||
@Json(name = "url") val url: String, | ||
@Json(name = "body") val body: String? = null, | ||
@Json(name = "info") val info: ImageInfo? = null, | ||
@Json(name = "usage") val usage: List<String>? = null, | ||
) |
19 changes: 19 additions & 0 deletions
19
...k-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomEmoteContent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package org.matrix.android.sdk.api.session.room.model | ||
|
||
import com.squareup.moshi.Json | ||
import com.squareup.moshi.JsonClass | ||
import org.matrix.android.sdk.api.session.room.powerlevels.Role | ||
|
||
/** | ||
* Class representing the EventType.ROOM_EMOTE state event content. | ||
*/ | ||
@JsonClass(generateAdapter = true) | ||
data class RoomEmoteContent( | ||
@Json(name = "images") val images: Map<String, EmoteImage>? = null, | ||
// TODO: "pack" support | ||
) { | ||
companion object { | ||
const val USAGE_EMOTICON = "emoticon" | ||
const val USAGE_STICKER = "sticker" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.