Remove alpha_secondary and alpha_disabled attrs

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(),

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();

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);

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<String> {
     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);
   }
 

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"

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"/>

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"/>

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"

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"/>
 

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"

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"/>
 

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"/>

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"

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"/>

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"/>
 

app/src/main/res/values/attrs.xml

@@ -11,8 +11,6 @@
   <attr format="reference" name="overlay_theme"/>
   <attr format="color" name="actionBarSecondaryText"/>
   <attr format="boolean" name="dark_status_bar"/>
-  <attr format="dimension" name="alpha_secondary"/>
-  <attr format="dimension" name="alpha_disabled"/>
   <attr format="color" name="colorAccentDialog"/>
   <attr format="dimension" name="card_elevation"/>
   <attr format="reference" name="materialButtonText"/>

app/src/main/res/values/theme.xml

@@ -16,8 +16,6 @@
     <item name="dialogTheme">@style/TasksDialog</item>
     <item name="android:dialogTheme">@style/TasksDialog</item>
     <item name="materialAlertDialogTheme">@style/TasksDialogAlert</item>
-    <item name="alpha_secondary">@dimen/alpha_secondary</item>
-    <item name="alpha_disabled">@dimen/alpha_disabled</item>
     <item name="android:textColorPrimary">@color/text_primary</item>
     <item name="android:textColorSecondary">@color/text_secondary</item>
     <item name="android:textColorTertiary">@color/text_tertiary</item>