diff --git a/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java b/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java index 0cd25f27e..864cfd93e 100644 --- a/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java +++ b/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java @@ -1,7 +1,6 @@ package org.tasks.dialogs; import static org.tasks.preferences.ResourceResolver.getData; -import static org.tasks.preferences.ResourceResolver.getDimen; import android.content.Context; import android.view.View; @@ -9,6 +8,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.widget.AppCompatImageView; import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -53,9 +53,12 @@ public class IconPickerHolder extends RecyclerView.ViewHolder { this.index = index; imageView.setImageResource(icon); if (inventory.hasPro()) { - imageView.setAlpha(getDimen(context, R.dimen.alpha_secondary)); + imageView.setAlpha(ResourcesCompat.getFloat(context.getResources(), R.dimen.alpha_secondary)); } else { - imageView.setAlpha(index < 1000 ? 1.0f : getDimen(context, R.dimen.alpha_disabled)); + imageView.setAlpha( + index < 1000 + ? 1.0f + : ResourcesCompat.getFloat(context.getResources(), R.dimen.alpha_disabled)); } DrawableCompat.setTint( imageView.getDrawable(), diff --git a/app/src/main/java/org/tasks/preferences/ResourceResolver.java b/app/src/main/java/org/tasks/preferences/ResourceResolver.java index bb3be98ad..0fe81d47a 100644 --- a/app/src/main/java/org/tasks/preferences/ResourceResolver.java +++ b/app/src/main/java/org/tasks/preferences/ResourceResolver.java @@ -12,13 +12,6 @@ public class ResourceResolver { return typedValue.data; } - @Deprecated - public static float getDimen(Context context, int resId) { - TypedValue typedValue = new TypedValue(); - context.getResources().getValue(resId, typedValue, true); - return typedValue.getFloat(); - } - @Deprecated public static int getResourceId(Context context, int attr) { TypedValue typedValue = new TypedValue(); diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java index bc9975a2c..5ce0e5ff5 100644 --- a/app/src/main/java/org/tasks/ui/ChipProvider.java +++ b/app/src/main/java/org/tasks/ui/ChipProvider.java @@ -3,12 +3,12 @@ package org.tasks.ui; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import static com.todoroo.andlib.utility.AndroidUtilities.assertMainThread; -import static org.tasks.preferences.ResourceResolver.getDimen; import android.app.Activity; import android.content.Context; import android.content.res.ColorStateList; import androidx.annotation.LayoutRes; +import androidx.core.content.res.ResourcesCompat; import com.google.android.material.chip.Chip; import com.google.common.base.Predicates; import com.google.common.base.Strings; @@ -66,7 +66,8 @@ public class ChipProvider { this.inventory = inventory; this.themeCache = themeCache; this.localBroadcastManager = localBroadcastManager; - iconAlpha = (int) (255 * getDimen(context, R.dimen.alpha_secondary)); + iconAlpha = + (int) (255 * ResourcesCompat.getFloat(context.getResources(), R.dimen.alpha_secondary)); googleTaskListDao.subscribeToLists().observeForever(this::updateGoogleTaskLists); caldavDao.subscribeToCalendars().observeForever(this::updateCaldavCalendars); diff --git a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java index bb0be00a4..54195ba1c 100644 --- a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java +++ b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java @@ -2,8 +2,6 @@ package org.tasks.ui; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop; -import static org.tasks.preferences.ResourceResolver.getData; -import static org.tasks.preferences.ResourceResolver.getDimen; import android.content.Context; import android.content.res.ColorStateList; @@ -33,7 +31,8 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter { super(context, R.layout.simple_list_item_single_choice_themed, items); this.context = context; this.accent = accent; - this.alpha = (int) (255 * getDimen(context, R.dimen.alpha_secondary)); + this.alpha = + (int) (255 * ResourcesCompat.getFloat(context.getResources(), R.dimen.alpha_secondary)); this.tint = ContextCompat.getColor(context, R.color.icon_tint); } diff --git a/app/src/main/res/layout/control_set_clear_button.xml b/app/src/main/res/layout/control_set_clear_button.xml index ccc04f9cc..156d1bd13 100644 --- a/app/src/main/res/layout/control_set_clear_button.xml +++ b/app/src/main/res/layout/control_set_clear_button.xml @@ -7,7 +7,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_gravity="top|center" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:src="@drawable/ic_outline_clear_24px" diff --git a/app/src/main/res/layout/control_set_template.xml b/app/src/main/res/layout/control_set_template.xml index 2d92c6c9b..78e2eaee4 100644 --- a/app/src/main/res/layout/control_set_template.xml +++ b/app/src/main/res/layout/control_set_template.xml @@ -21,7 +21,7 @@ android:paddingEnd="@dimen/keyline_second" android:paddingLeft="@dimen/keyline_first" android:paddingRight="@dimen/keyline_second" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:scaleType="center" android:tint="@color/icon_tint" tools:ignore="ContentDescription"/> diff --git a/app/src/main/res/layout/control_set_timers.xml b/app/src/main/res/layout/control_set_timers.xml index 96eead29e..a63d5e959 100644 --- a/app/src/main/res/layout/control_set_timers.xml +++ b/app/src/main/res/layout/control_set_timers.xml @@ -40,7 +40,7 @@ android:layout_weight="1" android:paddingLeft="5dip" android:paddingRight="5dip" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:gravity="center_vertical|center_horizontal" android:scaleType="centerInside" android:tint="@color/icon_tint"/> diff --git a/app/src/main/res/layout/dialog_icon_picker_cell.xml b/app/src/main/res/layout/dialog_icon_picker_cell.xml index bdf9847a1..573c1f7e4 100644 --- a/app/src/main/res/layout/dialog_icon_picker_cell.xml +++ b/app/src/main/res/layout/dialog_icon_picker_cell.xml @@ -7,7 +7,7 @@ android:layout_height="@dimen/icon_picker_size" android:padding="8dp" android:tint="@color/icon_tint" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:clickable="true" android:focusable="true" android:src="@drawable/ic_outline_label_24px" diff --git a/app/src/main/res/layout/filter_adapter_row.xml b/app/src/main/res/layout/filter_adapter_row.xml index ad2774509..e3825d1d3 100644 --- a/app/src/main/res/layout/filter_adapter_row.xml +++ b/app/src/main/res/layout/filter_adapter_row.xml @@ -36,7 +36,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_gravity="center_vertical" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:scaleType="center" android:tint="@color/icon_tint"/> diff --git a/app/src/main/res/layout/filter_adapter_subheader.xml b/app/src/main/res/layout/filter_adapter_subheader.xml index 932b074d9..3585e7a09 100644 --- a/app/src/main/res/layout/filter_adapter_subheader.xml +++ b/app/src/main/res/layout/filter_adapter_subheader.xml @@ -24,7 +24,7 @@ android:paddingEnd="@dimen/keyline_first" android:paddingLeft="0dp" android:paddingRight="@dimen/keyline_first" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:clickable="true" android:focusable="true" android:scaleType="center" diff --git a/app/src/main/res/layout/list_settings_color.xml b/app/src/main/res/layout/list_settings_color.xml index a503f15eb..be9afa67c 100644 --- a/app/src/main/res/layout/list_settings_color.xml +++ b/app/src/main/res/layout/list_settings_color.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:contentDescription="@string/color" android:src="@drawable/ic_baseline_lens_24px"/> diff --git a/app/src/main/res/layout/list_settings_icon.xml b/app/src/main/res/layout/list_settings_icon.xml index 8740f824c..cd41d7f10 100644 --- a/app/src/main/res/layout/list_settings_icon.xml +++ b/app/src/main/res/layout/list_settings_icon.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:contentDescription="@string/icon" android:src="@drawable/ic_outline_label_24px" android:tint="@color/icon_tint"/> diff --git a/app/src/main/res/layout/location_row.xml b/app/src/main/res/layout/location_row.xml index 1ca2c05ea..6f021df2c 100644 --- a/app/src/main/res/layout/location_row.xml +++ b/app/src/main/res/layout/location_row.xml @@ -11,7 +11,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_gravity="top|center" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml index 3fddfaab1..d821fb07d 100644 --- a/app/src/main/res/layout/task_adapter_row_body.xml +++ b/app/src/main/res/layout/task_adapter_row_body.xml @@ -48,7 +48,7 @@ android:layout_toRightOf="@id/completeBox" android:paddingEnd="2dp" android:paddingRight="2dp" - android:alpha="?attr/alpha_secondary" + android:alpha="@dimen/alpha_secondary" android:src="@drawable/ic_outline_visibility_off_24px" android:tint="@color/icon_tint" android:visibility="gone"/> diff --git a/app/src/main/res/layout/task_list_body_empty.xml b/app/src/main/res/layout/task_list_body_empty.xml index 9b1c30022..0f821636e 100644 --- a/app/src/main/res/layout/task_list_body_empty.xml +++ b/app/src/main/res/layout/task_list_body_empty.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:alpha="?attr/alpha_disabled" + android:alpha="@dimen/alpha_disabled" android:src="@drawable/ic_outline_inbox_168px" android:tint="@color/icon_tint"/> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 19c6d1f5e..c4e2a803f 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -11,8 +11,6 @@ - - diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml index 19570515e..c7166be62 100644 --- a/app/src/main/res/values/theme.xml +++ b/app/src/main/res/values/theme.xml @@ -16,8 +16,6 @@ @style/TasksDialog @style/TasksDialog @style/TasksDialogAlert - @dimen/alpha_secondary - @dimen/alpha_disabled @color/text_primary @color/text_secondary @color/text_tertiary