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

implement media_tagged activity

This commit is contained in:
vanita5 2016-03-25 16:32:43 +01:00
parent 7bf4bb2195
commit 6563017872
6 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.java
View File

@ -353,7 +353,10 @@ public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter<Recycler
case Activity.Action.RETWEETED_MENTION:
case Activity.Action.FAVORITED_MENTION:
case Activity.Action.LIST_CREATED:
case Activity.Action.LIST_MEMBER_ADDED: {
case Activity.Action.LIST_MEMBER_ADDED:
case Activity.Action.MEDIA_TAGGED:
case Activity.Action.RETWEETED_MEDIA_TAGGED:
case Activity.Action.FAVORITED_MEDIA_TAGGED: {
if (mMentionsOnly) return ITEM_VIEW_TYPE_EMPTY;
ParcelableActivityUtils.initAfterFilteredSourceIds(activity, mFilteredUserIds, mFollowingOnly);
if (ArrayUtils.isEmpty(activity.after_filtered_source_ids)) {

38
twidere/src/main/java/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.java
View File

@ -218,6 +218,44 @@ public class ActivityTitleSummaryMessage {
sources, nameFirst);
return new ActivityTitleSummaryMessage(typeIcon, color, title, null);
}
case Activity.Action.MEDIA_TAGGED: {
if (byFriends) return null;
int typeIcon = R.drawable.ic_activity_action_media_tagged;
int color = ContextCompat.getColor(context, R.color.highlight_tagged);
CharSequence title;
title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_media_tagged,
R.string.activity_about_me_media_tagged_multi, sources, nameFirst);
final String summary = activity.target_statuses[0].text_unescaped;
return new ActivityTitleSummaryMessage(typeIcon, color, title, summary);
}
case Activity.Action.FAVORITED_MEDIA_TAGGED: {
if (byFriends) return null;
int typeIcon;
int color;
CharSequence title;
if (shouldUseStarsForLikes) {
typeIcon = R.drawable.ic_activity_action_favorite;
color = ContextCompat.getColor(context, R.color.highlight_favorite);
title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_favorited_media_tagged,
R.string.activity_about_me_favorited_media_tagged_multi, sources, nameFirst);
} else {
typeIcon = R.drawable.ic_activity_action_like;
color = ContextCompat.getColor(context, R.color.highlight_like);
title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_liked_media_tagged,
R.string.activity_about_me_liked_media_tagged_multi, sources, nameFirst);
}
final String summary = activity.target_statuses[0].text_unescaped;
return new ActivityTitleSummaryMessage(typeIcon, color, title, summary);
}
case Activity.Action.RETWEETED_MEDIA_TAGGED: {
if (byFriends) return null;
int typeIcon = R.drawable.ic_activity_action_retweet;
int color = ContextCompat.getColor(context, R.color.highlight_retweet);
CharSequence title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_retweeted_media_tagged,
R.string.activity_about_me_retweeted_media_tagged_multi, sources, nameFirst);
final String summary = activity.target_statuses[0].text_unescaped;
return new ActivityTitleSummaryMessage(typeIcon, color, title, summary);
}
}
return null;
}

8
twidere/src/main/res-localized/values-de/strings.xml
View File

@ -235,6 +235,8 @@
<string name="activity_about_me_retweet_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> haben deinen Tweet retweeted.</string>
<string name="activity_about_me_retweeted_retweet"><xliff:g id="user">%s</xliff:g> hat deinen Retweet retweeted.</string>
<string name="activity_about_me_retweeted_retweet_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> haben deinen Retweet retweeted.</string>
<string name="activity_about_me_retweeted_media_tagged"><xliff:g id="user">%s</xliff:g> hat einen Tweet in dem du getagged wurdest retweetet.</string>
<string name="activity_about_me_retweeted_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> haben einen Tweet in dem du getagged wurdest retweetet.</string>
<string name="activity_about_me_retweeted_mention"><xliff:g id="user">%s</xliff:g> retweetete einen Tweet, in dem du erwähnt wurdest.</string>
<string name="activity_about_me_retweeted_mention_multi"><xliff:g id="user">%s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> retweeteten einen Tweet, in dem du erwähnt wurdest.</string>
<string name="activity_about_me_favorited_mention"><xliff:g id="user">%s</xliff:g> hat einen Tweet favorisiert, in dem du erwähnt wurdest.</string>
@ -244,6 +246,12 @@
<string name="activity_about_me_list_member_added"><xliff:g id="user">%s</xliff:g> hat Dich zur Liste hinzugefügt.</string>
<string name="activity_about_me_list_member_added_with_name"><xliff:g id="user">%1$s</xliff:g> hat Dich zur Liste "<xliff:g id="list">%2$s</xliff:g>\" hinzugefügt.</string>
<string name="activity_about_me_list_member_added_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> haben Dich zu ihren Listen hinzugefügt.</string>
<string name="activity_about_me_media_tagged"><xliff:g id="user">%s</xliff:g> hat dich getagged.</string>
<string name="activity_about_me_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> haben dich getagged.</string>
<string name="activity_about_me_liked_media_tagged"><xliff:g id="user">%s</xliff:g> gefällt ein Tweet in dem du getagged wurdest.</string>
<string name="activity_about_me_liked_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> gefällt ein Tweet in dem du getagged wurdest.</string>
<string name="activity_about_me_favorited_media_tagged"><xliff:g id="user">%s</xliff:g> favorisierte ein Tweet in dem du getagged wurdest.</string>
<string name="activity_about_me_favorited_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> und <xliff:g id="other">%2$s</xliff:g> favorisierten ein Tweet in dem du getagged wurdest.</string>
<string name="activity_by_friends_favorite"><xliff:g id="user">%1$s</xliff:g> favorisierte <xliff:g id="target">%2$s</xliff:g>s tweet.</string>
<string name="activity_by_friends_favorite_multi"><xliff:g id="user">%1$s</xliff:g> hat Tweets von <xliff:g id="target">%2$s</xliff:g> und <xliff:g id="other">%3$s</xliff:g> favorisiert.</string>
<string name="activity_by_friends_like"><xliff:g id="user">%1$s</xliff:g> gefällt der Tweet von <xliff:g id="target">%2$s</xliff:g>.</string>

1
twidere/src/main/res/values/colors.xml
View File

@ -29,6 +29,7 @@
<color name="highlight_like">@color/material_pink</color>
<color name="highlight_reply">@color/material_light_blue</color>
<color name="highlight_follow">@color/material_light_blue</color>
<color name="highlight_tagged">@color/material_light_blue</color>
<color name="unread_color">@color/material_red</color>
<color name="branding_color">@color/material_cyan</color>
<color name="bg_color_tab_pressed">#40808080</color>

8
twidere/src/main/res/values/strings.xml
View File

@ -240,6 +240,8 @@
<string name="activity_about_me_retweet_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> retweeted your tweet.</string>
<string name="activity_about_me_retweeted_retweet"><xliff:g id="user">%s</xliff:g> retweeted your retweet.</string>
<string name="activity_about_me_retweeted_retweet_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> retweeted your retweet.</string>
<string name="activity_about_me_retweeted_media_tagged"><xliff:g id="user">%s</xliff:g> retweeted a tweet you were tagged in.</string>
<string name="activity_about_me_retweeted_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> retweeted a tweet you were tagged in.</string>
<string name="activity_about_me_retweeted_mention"><xliff:g id="user">%s</xliff:g> retweeted a tweet you were mentioned in.</string>
<string name="activity_about_me_retweeted_mention_multi"><xliff:g id="user">%s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> retweeted a tweet you were mentioned in.</string>
<string name="activity_about_me_favorited_mention"><xliff:g id="user">%s</xliff:g> favorited a tweet you were mentioned in.</string>
@ -249,6 +251,12 @@
<string name="activity_about_me_list_member_added"><xliff:g id="user">%s</xliff:g> added you to list.</string>
<string name="activity_about_me_list_member_added_with_name"><xliff:g id="user">%1$s</xliff:g> added you to list <xliff:g id="list">%2$s</xliff:g>".</string>
<string name="activity_about_me_list_member_added_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> added you to their lists.</string>
<string name="activity_about_me_media_tagged"><xliff:g id="user">%s</xliff:g> tagged you.</string>
<string name="activity_about_me_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> tagged you.</string>
<string name="activity_about_me_liked_media_tagged"><xliff:g id="user">%s</xliff:g> liked a tweet you were tagged in.</string>
<string name="activity_about_me_liked_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> liked a tweet you were tagged in.</string>
<string name="activity_about_me_favorited_media_tagged"><xliff:g id="user">%s</xliff:g> favorited a tweet you were tagged in.</string>
<string name="activity_about_me_favorited_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> and <xliff:g id="other">%2$s</xliff:g> favorited a tweet you were tagged in.</string>
<string name="activity_by_friends_favorite"><xliff:g id="user">%1$s</xliff:g> favorited <xliff:g id="target">%2$s</xliff:g>\'s tweet.</string>
<string name="activity_by_friends_favorite_multi"><xliff:g id="user">%1$s</xliff:g> favorited <xliff:g id="target">%2$s</xliff:g> and <xliff:g id="other">%3$s</xliff:g>\'s tweet.</string>
<string name="activity_by_friends_like"><xliff:g id="user">%1$s</xliff:g> liked <xliff:g id="target">%2$s</xliff:g>\'s tweet.</string>

9
twidere/src/main/svg/drawable/ic_activity_action_media_tagged-mdpi.svg Normal file
View File

@ -0,0 +1,9 @@
<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<path d="M24 24H0V0h24v24z" id="a"/>
</defs>
<clipPath id="b">
<use overflow="visible" xlink:href="#a"/>
</clipPath>
<path clip-path="url(#b)" d="M3 4V1h2v3h3v2H5v3H3V6H0V4h3zm3 6V7h3V4h7l1.83 2H21c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H5c-1.1 0-2-.9-2-2V10h3zm7 9c2.76 0 5-2.24 5-5s-2.24-5-5-5-5 2.24-5 5 2.24 5 5 5zm-3.2-5c0 1.77 1.43 3.2 3.2 3.2s3.2-1.43 3.2-3.2-1.43-3.2-3.2-3.2-3.2 1.43-3.2 3.2z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 589 B