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

renamed resource

This commit is contained in:
Mariotaku Lee 2016-05-31 09:37:21 +08:00
parent 788f634bd2
commit e6330dc252
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java
View File

@ -238,6 +238,9 @@ public class User extends TwitterResponseObject implements Comparable<User>, Par
@JsonField(name = "statusnet_blocking")
boolean statusnetBlocking;
@JsonField(name = "pinned_tweet_ids")
String[] pinnedTweetIds;
public boolean canMediaTag() {
return canMediaTag;
}
@ -528,6 +531,10 @@ public class User extends TwitterResponseObject implements Comparable<User>, Par
return followsYou;
}
public String[] getPinnedTweetIds() {
return pinnedTweetIds;
}
@Override
public String toString() {
return "User{" +

24
twidere/src/main/res/layout/card_item_status_compact.xml
View File

@ -365,8 +365,8 @@
<org.mariotaku.twidere.view.IconActionView
android:id="@+id/reply_icon"
android:layout_width="@dimen/button_size_content_card_compact"
android:layout_height="@dimen/button_size_content_card_compact"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="@dimen/button_size_content_card_action"
android:contentDescription="@string/reply"
android:focusable="false"
android:gravity="center"
@ -385,7 +385,7 @@
android:ellipsize="end"
android:focusable="false"
android:gravity="center"
android:minHeight="@dimen/button_size_content_card_compact"
android:minHeight="@dimen/button_size_content_card_action"
android:singleLine="true"
android:tag="font_family|user"
android:textAppearance="?android:textAppearanceSmall"
@ -396,14 +396,16 @@
android:id="@+id/retweet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/element_spacing_small"
android:layout_marginStart="@dimen/element_spacing_small"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="false">
<org.mariotaku.twidere.view.IconActionView
android:id="@+id/retweet_icon"
android:layout_width="@dimen/button_size_content_card_compact"
android:layout_height="@dimen/button_size_content_card_compact"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="@dimen/button_size_content_card_action"
android:contentDescription="@string/retweet"
android:focusable="false"
android:gravity="center"
@ -422,7 +424,7 @@
android:ellipsize="end"
android:focusable="false"
android:gravity="center"
android:minHeight="@dimen/button_size_content_card_compact"
android:minHeight="@dimen/button_size_content_card_action"
android:singleLine="true"
android:tag="font_family|user"
android:textAppearance="?android:textAppearanceSmall"
@ -434,14 +436,16 @@
android:id="@+id/favorite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/element_spacing_small"
android:layout_marginStart="@dimen/element_spacing_small"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="false">
<org.mariotaku.twidere.view.IconActionView
android:id="@+id/favorite_icon"
android:layout_width="@dimen/button_size_content_card_compact"
android:layout_height="@dimen/button_size_content_card_compact"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="@dimen/button_size_content_card_action"
android:contentDescription="@string/like"
android:focusable="false"
android:gravity="center"
@ -460,7 +464,7 @@
android:ellipsize="end"
android:focusable="false"
android:gravity="center"
android:minHeight="@dimen/button_size_content_card_compact"
android:minHeight="@dimen/button_size_content_card_action"
android:singleLine="true"
android:tag="font_family|user"
android:textAppearance="?android:textAppearanceSmall"
@ -471,7 +475,7 @@
<org.mariotaku.twidere.view.IconActionButton
android:id="@+id/item_menu"
style="?cardActionButtonStyle"
android:layout_width="@dimen/button_size_content_card_compact"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/action_buttons"
android:layout_alignParentEnd="true"

2
twidere/src/main/res/values/dimens.xml
View File

@ -9,7 +9,7 @@
<dimen name="button_size_content_card">42dp</dimen>
<dimen name="button_size_content_card_compact">36dp</dimen>
<dimen name="button_size_content_card_action">36dp</dimen>
<dimen name="element_spacing_xsmall">2dp</dimen>
<dimen name="element_spacing_small">4dp</dimen>
<dimen name="element_spacing_msmall">6dp</dimen>