Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

リアクションのボタン画像がズレていたミスの修正

This commit is contained in:
tateisu 2018-08-23 13:08:03 +09:00
parent 9a0ac5f8ef
commit 6d109900da
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/jp/juggler/subwaytooter/api/entity/MisskeyReaction.kt
View File

@ -8,16 +8,16 @@ enum class MisskeyReaction(
val btnDrawableId : Int
) {
Like("like", R.drawable.emj_1f44d, R.drawable.btn_reaction_angry),
Love("love", R.drawable.emj_2665, R.drawable.btn_reaction_confused),
Laugh("laugh", R.drawable.emj_1f606, R.drawable.btn_reaction_congrats),
Like("like", R.drawable.emj_1f44d, R.drawable.btn_reaction_like),
Love("love", R.drawable.emj_2665, R.drawable.btn_reaction_love),
Laugh("laugh", R.drawable.emj_1f606, R.drawable.btn_reaction_laugh),
Hmm("hmm", R.drawable.emj_1f914, R.drawable.btn_reaction_hmm),
Surprise("surprise", R.drawable.emj_1f62e, R.drawable.btn_reaction_laugh),
Congrats("congrats", R.drawable.emj_1f389, R.drawable.btn_reaction_like),
Angry("angry", R.drawable.emj_1f4a2, R.drawable.btn_reaction_love),
Confused("confused", R.drawable.emj_1f625, R.drawable.btn_reaction_pudding),
Surprise("surprise", R.drawable.emj_1f62e, R.drawable.btn_reaction_surprise),
Congrats("congrats", R.drawable.emj_1f389,R.drawable.btn_reaction_congrats),
Angry("angry", R.drawable.emj_1f4a2, R.drawable.btn_reaction_angry),
Confused("confused", R.drawable.emj_1f625,R.drawable.btn_reaction_confused),
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)
;

10
app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
View File

@ -106,7 +106,7 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
val in_reply_to_id : EntityId?
// 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
val reblog : TootStatus?
@ -223,8 +223,9 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
}
this.sensitive = bv
this.in_reply_to_id = EntityId.Companion.mayNull(src.parseString("replyId"))
this.in_reply_to_account_id = null
this.reply = parser.status(src.optJSONObject("reply"))
this.in_reply_to_id = EntityId.mayNull(src.parseString("replyId"))
this.in_reply_to_account_id = reply?.account?.id
this.pinned = parser.pinned
this.muted = false
@ -299,7 +300,6 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
this.reactionCounts = parseReactionCounts(src.optJSONObject("reactionCounts"))
this.reblog = parser.status(src.optJSONObject("renote"))
this.reply = parser.status(src.optJSONObject("reply"))
this.deletedAt = src.parseString("deletedAt")
this.time_deleted_at = parseTime(deletedAt)
@ -387,7 +387,7 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() {
this._orderId = this.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.tags = parseListOrNull(::TootTag, src.optJSONArray("tags"))
this.application =