diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/iface/IIconActionButton.java b/twidere/src/main/java/org/mariotaku/twidere/view/iface/IIconActionButton.java
index 721148b93..c974da0ea 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/view/iface/IIconActionButton.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/view/iface/IIconActionButton.java
@@ -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);
+ }
}
}
}
diff --git a/twidere/src/main/res/drawable-hdpi/ic_action_reply.png b/twidere/src/main/res/drawable-hdpi/ic_action_reply.png
deleted file mode 100644
index 204646550..000000000
Binary files a/twidere/src/main/res/drawable-hdpi/ic_action_reply.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-hdpi/ic_action_retweet.png b/twidere/src/main/res/drawable-hdpi/ic_action_retweet.png
deleted file mode 100644
index 80b78ab64..000000000
Binary files a/twidere/src/main/res/drawable-hdpi/ic_action_retweet.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-mdpi/ic_action_reply.png b/twidere/src/main/res/drawable-mdpi/ic_action_reply.png
deleted file mode 100644
index a1f1676e5..000000000
Binary files a/twidere/src/main/res/drawable-mdpi/ic_action_reply.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-mdpi/ic_action_retweet.png b/twidere/src/main/res/drawable-mdpi/ic_action_retweet.png
deleted file mode 100644
index 9258fb26b..000000000
Binary files a/twidere/src/main/res/drawable-mdpi/ic_action_retweet.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-xhdpi/ic_action_reply.png b/twidere/src/main/res/drawable-xhdpi/ic_action_reply.png
deleted file mode 100644
index 23cf88ca0..000000000
Binary files a/twidere/src/main/res/drawable-xhdpi/ic_action_reply.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-xhdpi/ic_action_retweet.png b/twidere/src/main/res/drawable-xhdpi/ic_action_retweet.png
deleted file mode 100644
index 3d4bbce57..000000000
Binary files a/twidere/src/main/res/drawable-xhdpi/ic_action_retweet.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-xxhdpi/ic_action_reply.png b/twidere/src/main/res/drawable-xxhdpi/ic_action_reply.png
deleted file mode 100644
index 84275321d..000000000
Binary files a/twidere/src/main/res/drawable-xxhdpi/ic_action_reply.png and /dev/null differ
diff --git a/twidere/src/main/res/drawable-xxhdpi/ic_action_retweet.png b/twidere/src/main/res/drawable-xxhdpi/ic_action_retweet.png
deleted file mode 100644
index 87ddde1b3..000000000
Binary files a/twidere/src/main/res/drawable-xxhdpi/ic_action_retweet.png and /dev/null differ
diff --git a/twidere/src/main/res/layout/list_item_status.xml b/twidere/src/main/res/layout/list_item_status.xml
index c4925f862..214359843 100644
--- a/twidere/src/main/res/layout/list_item_status.xml
+++ b/twidere/src/main/res/layout/list_item_status.xml
@@ -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"/>
+ tools:text="255"/>
+ tools:text="255"/>
@@ -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"/>
diff --git a/twidere/src/main/res/values/styles.xml b/twidere/src/main/res/values/styles.xml
index 8a14fdf5c..d903f6d23 100644
--- a/twidere/src/main/res/values/styles.xml
+++ b/twidere/src/main/res/values/styles.xml
@@ -17,13 +17,12 @@