archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove icon_tint attr

Browse Source
pull/848/head
Alex Baker 6 years ago
parent 97a1e4105c
commit 90d51aca38
14 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File

7
app/src/main/java/org/tasks/dialogs/IconPickerHolder.java
Unescape Escape View File

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

2
app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
this.context = context; this.context = context;
this.accent = accent; this.accent = accent;
this.alpha = (int) (255 * getDimen(context, R.dimen.alpha_secondary)); 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 @NonNull

2
app/src/main/res/layout/control_set_clear_button.xml
Unescape Escape View File

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

2
app/src/main/res/layout/control_set_template.xml
Unescape Escape View File

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

2
app/src/main/res/layout/control_set_timers.xml
Unescape Escape View File

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

2
app/src/main/res/layout/filter_adapter_row.xml
Unescape Escape View File

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

2
app/src/main/res/layout/filter_adapter_subheader.xml
Unescape Escape View File

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

2
app/src/main/res/layout/list_settings_icon.xml
Unescape Escape View File

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

2
app/src/main/res/layout/location_row.xml
Unescape Escape View File

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

2
app/src/main/res/layout/preference_draggable_row.xml
Unescape Escape View File

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

2
app/src/main/res/layout/tag_edit_row.xml
Unescape Escape View File

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

2
app/src/main/res/layout/task_list_body_empty.xml
Unescape Escape View File

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

1
app/src/main/res/values/attrs.xml
Unescape Escape View File

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

3
app/src/main/res/values/theme.xml
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save