diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 41ef87fa..b222c91c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -626,11 +626,13 @@ public class ComposeActivity extends BaseActivity {
private void enableMediaPicking() {
mediaPick.setEnabled(true);
+ ThemeUtils.setImageViewTint(mediaPick, R.attr.compose_media_button_tint);
mediaPick.setImageResource(R.drawable.ic_media);
}
private void disableMediaPicking() {
mediaPick.setEnabled(false);
+ ThemeUtils.setImageViewTint(mediaPick, R.attr.compose_media_button_disabled_tint);
mediaPick.setImageResource(R.drawable.ic_media_disabled);
}
diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusButton.java b/app/src/main/java/com/keylesspalace/tusky/StatusButton.java
deleted file mode 100644
index 926c1224..00000000
--- a/app/src/main/java/com/keylesspalace/tusky/StatusButton.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2017 Andrew Dawson
- *
- * This file is part of Tusky.
- *
- * Tusky is free software: you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Tusky. If not, see
- * . */
-
-package com.keylesspalace.tusky;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.support.v7.widget.AppCompatImageButton;
-import android.util.AttributeSet;
-
-public class StatusButton extends AppCompatImageButton {
- private static final int[] STATE_MARKED = { R.attr.state_marked };
-
- private boolean marked;
-
- public StatusButton(Context context, AttributeSet attributeSet) {
- super(context, attributeSet);
- TypedArray array = context.getTheme().obtainStyledAttributes(
- attributeSet, R.styleable.StatusButton, 0, 0);
- try {
- marked = array.getBoolean(R.styleable.StatusButton_state_marked, false);
- } finally {
- array.recycle();
- }
- }
-
- @Override
- public int[] onCreateDrawableState(int extraSpace) {
- if (marked) {
- extraSpace += 1;
- }
- int[] drawableState = super.onCreateDrawableState(extraSpace);
- if (marked) {
- mergeDrawableStates(drawableState, STATE_MARKED);
- }
- return drawableState;
- }
-
- public void setMarked(boolean marked) {
- this.marked = marked;
- }
-}
diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
index 7ded23d1..3b3e3595 100644
--- a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
@@ -44,8 +44,8 @@ public class StatusViewHolder extends RecyclerView.ViewHolder {
private View rebloggedBar;
private TextView rebloggedByDisplayName;
private ImageButton replyButton;
- private StatusButton reblogButton;
- private StatusButton favouriteButton;
+ private ImageButton reblogButton;
+ private ImageButton favouriteButton;
private ImageButton moreButton;
private boolean favourited;
private boolean reblogged;
@@ -71,8 +71,8 @@ public class StatusViewHolder extends RecyclerView.ViewHolder {
rebloggedBar = itemView.findViewById(R.id.status_reblogged_bar);
rebloggedByDisplayName = (TextView) itemView.findViewById(R.id.status_reblogged);
replyButton = (ImageButton) itemView.findViewById(R.id.status_reply);
- reblogButton = (StatusButton) itemView.findViewById(R.id.status_reblog);
- favouriteButton = (StatusButton) itemView.findViewById(R.id.status_favourite);
+ reblogButton = (ImageButton) itemView.findViewById(R.id.status_reblog);
+ favouriteButton = (ImageButton) itemView.findViewById(R.id.status_favourite);
moreButton = (ImageButton) itemView.findViewById(R.id.status_more);
reblogged = false;
favourited = false;
@@ -189,21 +189,33 @@ public class StatusViewHolder extends RecyclerView.ViewHolder {
public void setReblogged(boolean reblogged) {
this.reblogged = reblogged;
- reblogButton.setMarked(reblogged);
+ int attribute;
+ if (reblogged) {
+ attribute = R.attr.status_reblog_button_marked_tint;
+ } else {
+ attribute = R.attr.status_reblog_button_tint;
+ }
+ ThemeUtils.setImageViewTint(reblogButton, attribute);
}
+ /** This should only be called after setReblogged, in order to override the tint correctly. */
public void setRebloggingEnabled(boolean enabled) {
reblogButton.setEnabled(enabled);
- if (enabled) {
- reblogButton.setImageResource(R.drawable.ic_reblog);
- } else {
+ if (!enabled) {
+ ThemeUtils.setImageViewTint(reblogButton, R.attr.status_reblog_button_disabled_tint);
reblogButton.setImageResource(R.drawable.ic_reblog_disabled);
}
}
public void setFavourited(boolean favourited) {
this.favourited = favourited;
- favouriteButton.setMarked(favourited);
+ int attribute;
+ if (favourited) {
+ attribute = R.attr.status_favourite_button_marked_tint;
+ } else {
+ attribute = R.attr.status_favourite_button_tint;
+ }
+ ThemeUtils.setImageViewTint(favouriteButton, attribute);
}
public void setMediaPreviews(final Status.MediaAttachment[] attachments,
diff --git a/app/src/main/java/com/keylesspalace/tusky/ThemeUtils.java b/app/src/main/java/com/keylesspalace/tusky/ThemeUtils.java
index 8ca91612..8db45fac 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ThemeUtils.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ThemeUtils.java
@@ -16,9 +16,11 @@
package com.keylesspalace.tusky;
import android.content.Context;
+import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.support.v4.content.ContextCompat;
import android.util.TypedValue;
+import android.widget.ImageView;
public class ThemeUtils {
public static Drawable getDrawable(Context context, int attribute, int fallbackDrawable) {
@@ -49,4 +51,8 @@ public class ThemeUtils {
return android.R.color.black;
}
}
+
+ public static void setImageViewTint(ImageView view, int attribute) {
+ view.setColorFilter(getColor(view.getContext(), attribute), PorterDuff.Mode.SRC_IN);
+ }
}
diff --git a/app/src/main/res/color/favourite_button_dark.xml b/app/src/main/res/color/favourite_button_dark.xml
deleted file mode 100644
index fe6dc5a8..00000000
--- a/app/src/main/res/color/favourite_button_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- - @color/toolbar_background_dark
- @color/toolbar_icon_dark
- @style/AppTheme.ImageButton.Dark
- - @style/AppTheme.ReblogButton.Dark
- - @style/AppTheme.FavouriteButton.Dark
+ - @color/status_reblog_button_dark
+ - @color/status_reblog_button_marked_dark
+ - @color/status_reblog_button_disabled_dark
+ - @color/status_favourite_button_dark
+ - @color/status_favourite_button_marked_dark
- @drawable/toggle_small
- @color/sensitive_media_warning_background_dark
- @color/status_text_secondary_dark
@@ -36,7 +39,8 @@
- @drawable/status_divider_dark
- @drawable/tab_page_margin_dark
- @color/account_header_background_dark
- - @color/media_button_dark
+ - @color/compose_media_button_dark
+ - @color/compose_media_button_disabled_dark
- @color/compose_mention_dark
- @color/notification_content_faded_dark
- @color/notification_icon_tint_dark
@@ -46,14 +50,6 @@
- @color/image_button_dark
-
-
-
-
-
-
-
-