リアクションのボタン画像がズレていたミスの修正
This commit is contained in:
parent
9a0ac5f8ef
commit
6d109900da
|
@ -8,16 +8,16 @@ enum class MisskeyReaction(
|
||||||
val btnDrawableId : Int
|
val btnDrawableId : Int
|
||||||
) {
|
) {
|
||||||
|
|
||||||
Like("like", R.drawable.emj_1f44d, R.drawable.btn_reaction_angry),
|
Like("like", R.drawable.emj_1f44d, R.drawable.btn_reaction_like),
|
||||||
Love("love", R.drawable.emj_2665, R.drawable.btn_reaction_confused),
|
Love("love", R.drawable.emj_2665, R.drawable.btn_reaction_love),
|
||||||
Laugh("laugh", R.drawable.emj_1f606, R.drawable.btn_reaction_congrats),
|
Laugh("laugh", R.drawable.emj_1f606, R.drawable.btn_reaction_laugh),
|
||||||
Hmm("hmm", R.drawable.emj_1f914, R.drawable.btn_reaction_hmm),
|
Hmm("hmm", R.drawable.emj_1f914, R.drawable.btn_reaction_hmm),
|
||||||
Surprise("surprise", R.drawable.emj_1f62e, R.drawable.btn_reaction_laugh),
|
Surprise("surprise", R.drawable.emj_1f62e, R.drawable.btn_reaction_surprise),
|
||||||
Congrats("congrats", R.drawable.emj_1f389, R.drawable.btn_reaction_like),
|
Congrats("congrats", R.drawable.emj_1f389,R.drawable.btn_reaction_congrats),
|
||||||
Angry("angry", R.drawable.emj_1f4a2, R.drawable.btn_reaction_love),
|
Angry("angry", R.drawable.emj_1f4a2, R.drawable.btn_reaction_angry),
|
||||||
Confused("confused", R.drawable.emj_1f625, R.drawable.btn_reaction_pudding),
|
Confused("confused", R.drawable.emj_1f625,R.drawable.btn_reaction_confused),
|
||||||
Rip("rip", R.drawable.emj_1f607, R.drawable.btn_reaction_rip),
|
Rip("rip", R.drawable.emj_1f607, R.drawable.btn_reaction_rip),
|
||||||
Pudding("pudding", R.drawable.emj_1f36e, R.drawable.btn_reaction_surprise)
|
Pudding("pudding", R.drawable.emj_1f36e, R.drawable.btn_reaction_pudding)
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,7 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
|
||||||
val in_reply_to_id : EntityId?
|
val in_reply_to_id : EntityId?
|
||||||
|
|
||||||
// null or the ID of the account it replies to
|
// null or the ID of the account it replies to
|
||||||
private val in_reply_to_account_id : String?
|
private val in_reply_to_account_id : EntityId?
|
||||||
|
|
||||||
// null or the reblogged Status
|
// null or the reblogged Status
|
||||||
val reblog : TootStatus?
|
val reblog : TootStatus?
|
||||||
|
@ -223,8 +223,9 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
|
||||||
}
|
}
|
||||||
this.sensitive = bv
|
this.sensitive = bv
|
||||||
|
|
||||||
this.in_reply_to_id = EntityId.Companion.mayNull(src.parseString("replyId"))
|
this.reply = parser.status(src.optJSONObject("reply"))
|
||||||
this.in_reply_to_account_id = null
|
this.in_reply_to_id = EntityId.mayNull(src.parseString("replyId"))
|
||||||
|
this.in_reply_to_account_id = reply?.account?.id
|
||||||
|
|
||||||
this.pinned = parser.pinned
|
this.pinned = parser.pinned
|
||||||
this.muted = false
|
this.muted = false
|
||||||
|
@ -299,7 +300,6 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
|
||||||
this.reactionCounts = parseReactionCounts(src.optJSONObject("reactionCounts"))
|
this.reactionCounts = parseReactionCounts(src.optJSONObject("reactionCounts"))
|
||||||
|
|
||||||
this.reblog = parser.status(src.optJSONObject("renote"))
|
this.reblog = parser.status(src.optJSONObject("renote"))
|
||||||
this.reply = parser.status(src.optJSONObject("reply"))
|
|
||||||
|
|
||||||
this.deletedAt = src.parseString("deletedAt")
|
this.deletedAt = src.parseString("deletedAt")
|
||||||
this.time_deleted_at = parseTime(deletedAt)
|
this.time_deleted_at = parseTime(deletedAt)
|
||||||
|
@ -387,7 +387,7 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
|
||||||
|
|
||||||
this._orderId = this.id
|
this._orderId = this.id
|
||||||
this.in_reply_to_id = EntityId.mayNull(src.parseLong("in_reply_to_id"))
|
this.in_reply_to_id = EntityId.mayNull(src.parseLong("in_reply_to_id"))
|
||||||
this.in_reply_to_account_id = src.parseString("in_reply_to_account_id")
|
this.in_reply_to_account_id = EntityId.mayNull(src.parseLong("in_reply_to_account_id"))
|
||||||
this.mentions = parseListOrNull(::TootMention, src.optJSONArray("mentions"), log)
|
this.mentions = parseListOrNull(::TootMention, src.optJSONArray("mentions"), log)
|
||||||
this.tags = parseListOrNull(::TootTag, src.optJSONArray("tags"))
|
this.tags = parseListOrNull(::TootTag, src.optJSONArray("tags"))
|
||||||
this.application =
|
this.application =
|
||||||
|
|
Loading…
Reference in New Issue