Remove icon_tint attr

pull/848/head
Alex Baker 6 years ago
parent 97a1e4105c
commit 90d51aca38

@ -8,6 +8,7 @@ import android.view.View;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
@ -28,7 +29,7 @@ public class IconPickerHolder extends RecyclerView.ViewHolder {
private int index;
public IconPickerHolder(
IconPickerHolder(
Context context, Inventory inventory, @NonNull View view, Callback<Integer> onClick) {
super(view);
this.inventory = inventory;
@ -58,7 +59,9 @@ public class IconPickerHolder extends RecyclerView.ViewHolder {
}
DrawableCompat.setTint(
imageView.getDrawable(),
getData(context, selected ? R.attr.colorAccent : R.attr.icon_tint));
selected
? getData(context, R.attr.colorAccent)
: ContextCompat.getColor(context, R.color.icon_tint));
}
private boolean isEnabled() {

@ -34,7 +34,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
this.context = context;
this.accent = accent;
this.alpha = (int) (255 * getDimen(context, R.dimen.alpha_secondary));
this.tint = getData(context, R.attr.icon_tint);
this.tint = ContextCompat.getColor(context, R.color.icon_tint);
}
@NonNull

@ -11,4 +11,4 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:src="@drawable/ic_outline_clear_24px"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>

@ -23,7 +23,7 @@
android:paddingRight="@dimen/keyline_second"
android:alpha="?attr/alpha_secondary"
android:scaleType="center"
android:tint="?attr/icon_tint"
android:tint="@color/icon_tint"
tools:ignore="ContentDescription"/>
</LinearLayout>

@ -43,7 +43,7 @@
android:alpha="?attr/alpha_secondary"
android:gravity="center_vertical|center_horizontal"
android:scaleType="centerInside"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>
<Chronometer
android:id="@+id/timer"

@ -38,7 +38,7 @@
android:layout_gravity="center_vertical"
android:alpha="?attr/alpha_secondary"
android:scaleType="center"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>
<CheckedTextView
android:id="@+id/text"

@ -29,7 +29,7 @@
android:focusable="true"
android:scaleType="center"
android:src="@drawable/ic_outline_sync_problem_24px"
android:tint="?attr/icon_tint"
android:tint="@color/icon_tint"
android:visibility="gone"/>
<CheckedTextView

@ -14,7 +14,7 @@
android:alpha="?attr/alpha_secondary"
android:contentDescription="@string/icon"
android:src="@drawable/ic_outline_label_24px"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>
<TextView
android:layout_width="match_parent"

@ -16,7 +16,7 @@
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_outline_notifications_off_24px"
android:tint="?attr/icon_tint"
android:tint="@color/icon_tint"
android:visibility="gone"/>
<TextView

@ -28,5 +28,5 @@
android:layout_gravity="center_vertical|end"
android:scaleType="center"
android:src="@drawable/ic_outline_drag_handle_24px"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>
</androidx.cardview.widget.CardView>

@ -34,5 +34,5 @@
android:layout_gravity="center"
android:contentDescription="@string/remove"
android:src="@drawable/ic_outline_clear_24px"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>
</LinearLayout>

@ -25,7 +25,7 @@
android:layout_gravity="center"
android:alpha="?attr/alpha_disabled"
android:src="@drawable/ic_outline_inbox_168px"
android:tint="?attr/icon_tint"/>
android:tint="@color/icon_tint"/>
<TextView
android:layout_width="wrap_content"

@ -8,7 +8,6 @@
<!-- theme attributes -->
<attr format="color" name="asWindowBackground"/>
<attr format="color" name="asContentBackground"/>
<attr format="color" name="icon_tint"/>
<attr format="reference" name="overlay_theme"/>
<attr format="color" name="actionBarSecondaryText"/>
<attr format="boolean" name="dark_status_bar"/>

@ -12,7 +12,6 @@
<item name="windowActionModeOverlay">true</item>
<item name="asWindowBackground">@color/window_background</item>
<item name="asContentBackground">@color/content_background</item>
<item name="icon_tint">@color/icon_tint</item>
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
<item name="dialogTheme">@style/TasksDialog</item>
<item name="android:dialogTheme">@style/TasksDialog</item>
@ -44,13 +43,11 @@
<item name="colorOnBackground">@color/text_primary</item>
<item name="colorOnSurface">@color/text_primary</item>
<item name="colorAccent">?attr/colorAccentDialog</item>
<item name="icon_tint">@color/icon_tint</item>
</style>
<style name="TasksDialog" parent="DayNightDialog">
<item name="android:windowBackground">@color/dialog_background</item>
<item name="colorAccent">?attr/colorAccentDialog</item>
<item name="icon_tint">@color/icon_tint</item>
</style>
<style name="ThemeBlack" parent="Tasks">

Loading…
Cancel
Save