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

fixed status actions icon size

This commit is contained in:
Mariotaku Lee 2016-12-23 09:42:52 +08:00
parent 5493ab43f1
commit 4c792e87a8
13 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
twidere/src/main/java/org/mariotaku/twidere/view/iface/IIconActionButton.java
View File

@ -60,17 +60,26 @@ public interface IIconActionButton extends ChameleonView {
public static Appearance create(Context context, AttributeSet attributeSet, Chameleon.Theme theme) {
Appearance appearance = new Appearance();
ChameleonTypedArray a = ChameleonTypedArray.obtain(context, attributeSet, R.styleable.IconActionButton, theme);
appearance.setDefaultColor(a.getColor(R.styleable.IconActionButton_iabColor, theme.getColorForeground()));
appearance.setActivatedColor(a.getColor(R.styleable.IconActionButton_iabActivatedColor, theme.getColorAccent()));
appearance.setDisabledColor(a.getColor(R.styleable.IconActionButton_iabDisabledColor, theme.getTextColorSecondary()));
appearance.setDefaultColor(a.getColor(R.styleable.IconActionButton_iabColor, 0));
appearance.setActivatedColor(a.getColor(R.styleable.IconActionButton_iabActivatedColor, 0));
appearance.setDisabledColor(a.getColor(R.styleable.IconActionButton_iabDisabledColor, 0));
a.recycle();
return appearance;
}
public static void apply(IIconActionButton view, Appearance appearance) {
view.setDefaultColor(appearance.getDefaultColor());
view.setActivatedColor(appearance.getActivatedColor());
view.setDisabledColor(appearance.getDisabledColor());
final int defaultColor = appearance.getDefaultColor();
if (defaultColor != 0) {
view.setDefaultColor(defaultColor);
}
final int activatedColor = appearance.getActivatedColor();
if (activatedColor != 0) {
view.setActivatedColor(activatedColor);
}
final int disabledColor = appearance.getDisabledColor();
if (disabledColor != 0) {
view.setDisabledColor(disabledColor);
}
}
}
}

BIN
twidere/src/main/res/drawable-hdpi/ic_action_reply.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 253 B

BIN
twidere/src/main/res/drawable-hdpi/ic_action_retweet.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 317 B

BIN
twidere/src/main/res/drawable-mdpi/ic_action_reply.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 191 B

BIN
twidere/src/main/res/drawable-mdpi/ic_action_retweet.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 243 B

BIN
twidere/src/main/res/drawable-xhdpi/ic_action_reply.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 353 B

BIN
twidere/src/main/res/drawable-xhdpi/ic_action_retweet.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 410 B

BIN
twidere/src/main/res/drawable-xxhdpi/ic_action_reply.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 399 B

BIN
twidere/src/main/res/drawable-xxhdpi/ic_action_retweet.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 413 B

19
twidere/src/main/res/layout/list_item_status.xml
View File

@ -59,14 +59,14 @@
android:layout_toRightOf="@+id/statusInfoIcon"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:maxLines="1"
android:minHeight="@dimen/element_size_small"
android:tag="font_family|user"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"
tools:text="Retweeted by Mariotaku"
tools:textSize="@dimen/text_size_extra_small"
tools:visibility="visible"
android:maxLines="1"/>
tools:visibility="visible"/>
<org.mariotaku.twidere.view.ProfileImageView
android:id="@+id/profileImage"
@ -370,6 +370,7 @@
android:contentDescription="@string/reply"
android:focusable="false"
android:gravity="center"
android:padding="@dimen/element_spacing_small"
android:scaleType="centerInside"
android:src="@drawable/ic_action_reply"
app:iabActivatedColor="@color/highlight_reply"
@ -385,11 +386,11 @@
android:ellipsize="end"
android:focusable="false"
android:gravity="center"
android:maxLines="1"
android:minHeight="@dimen/button_size_content_card_action"
android:tag="font_family|user"
android:textAppearance="?android:textAppearanceSmall"
tools:text="255"
android:maxLines="1"/>
tools:text="255"/>
</LinearLayout>
<LinearLayout
@ -409,6 +410,7 @@
android:contentDescription="@string/retweet"
android:focusable="false"
android:gravity="center"
android:padding="@dimen/element_spacing_small"
android:scaleType="centerInside"
android:src="@drawable/ic_action_retweet"
app:iabActivatedColor="@color/highlight_retweet"
@ -424,11 +426,11 @@
android:ellipsize="end"
android:focusable="false"
android:gravity="center"
android:maxLines="1"
android:minHeight="@dimen/button_size_content_card_action"
android:tag="font_family|user"
android:textAppearance="?android:textAppearanceSmall"
tools:text="255"
android:maxLines="1"/>
tools:text="255"/>
</LinearLayout>
@ -449,6 +451,7 @@
android:contentDescription="@string/like"
android:focusable="false"
android:gravity="center"
android:padding="@dimen/element_spacing_small"
android:scaleType="centerInside"
android:src="@drawable/ic_action_heart"
app:iabActivatedColor="@color/highlight_like"
@ -464,11 +467,11 @@
android:ellipsize="end"
android:focusable="false"
android:gravity="center"
android:maxLines="1"
android:minHeight="@dimen/button_size_content_card_action"
android:tag="font_family|user"
android:textAppearance="?android:textAppearanceSmall"
tools:text="255"
android:maxLines="1"/>
tools:text="255"/>
</LinearLayout>
</LinearLayout>

5
twidere/src/main/res/values/styles.xml
View File

@ -17,13 +17,12 @@
<style name="Widget.CardActionButton" parent="Widget.Base.ImageButton">
<item name="android:background">?selectableItemBackgroundBorderless</item>
<item name="android:color">?android:textColorSecondary</item>
<item name="iabColor">?android:textColorTertiary</item>
<item name="iabColor">?android:textColorSecondary</item>
</style>
<style name="Widget.Light.CardActionButton" parent="Widget.Base.Light.ImageButton">
<item name="android:background">?selectableItemBackgroundBorderless</item>
<item name="iabColor">?android:textColorTertiary</item>
<item name="iabColor">?android:textColorSecondary</item>
</style>
<style name="Widget.ProfileImage" parent="Widget.Base">

12
twidere/src/main/svg/drawable/ic_action_reply-mdpi.svg Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>ic_action_reply-mdpi</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Action-Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="ic_action_reply-mdpi" fill="#FFFFFF">
<path d="M14.422114,12.2174921 C21.7935023,12.1312039 26.8125993,18.5996926 28,24.7217779 C24.5616028,21.9761874 20.0621108,18.1419899 14.422114,19.5269781 L14.422114,24.0952505 L4,15.7509314 L14.422114,8 L14.422114,12.2174921 L14.422114,12.2174921 Z" id="未命名-#1"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 823 B

12
twidere/src/main/svg/drawable/ic_action_retweet-mdpi.svg Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>ic_action_retweet-mdpi</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Action-Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="ic_action_retweet-mdpi" fill="#FFFFFF">
<path d="M11.803184,9.00197603 C14.713832,8.99890803 21.315804,8.99994803 24.225776,9.00150803 C24.697,8.98148803 25.135308,9.38038003 25.136868,9.85566003 C25.145084,12.268928 25.136348,14.682716 25.140976,17.095932 C26.4273,17.10056 27.713676,17.094892 29,17.099052 C27.28868,18.991904 25.562436,20.871496 23.842848,22.756652 C23.76386,22.902252 23.66844,22.7592 23.595692,22.68692 C21.908916,20.817624 20.191408,18.976044 18.5103,17.10212 C19.792516,17.090888 21.074264,17.10212 22.356532,17.096504 C22.369324,15.326164 22.367764,13.555304 22.357,11.785484 C20.97172,11.779868 15.894492,11.786004 14.509212,11.782416 C13.615644,10.847716 12.692228,9.94125203 11.803184,9.00197603 Z M8.158244,9.06416803 C8.247476,8.90681603 8.350488,9.08928403 8.430516,9.16109603 C10.112144,11.018068 11.819928,12.852004 13.490272,14.7187 C12.205456,14.731544 10.92064,14.71558 9.635824,14.726396 C9.630728,16.494136 9.633276,18.261928 9.634836,20.029668 C11.023704,20.041992 16.257816,20.028108 17.647204,20.036844 C18.541344,20.969464 19.46372,21.875356 20.348604,22.816712 C17.422616,22.816712 10.651436,22.81926 7.7255,22.815152 C7.250792,22.819832 6.840616,22.386568 6.860064,21.914408 C6.857464,19.517572 6.861572,17.121204 6.858556,14.724836 C5.572232,14.719688 4.286324,14.726916 3,14.7213 C4.708304,12.825848 6.434548,10.945788 8.158244,9.06416803 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB