Remove more compat methods

app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java

@@ -7,7 +7,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -89,7 +88,7 @@ public class FilterViewHolder extends RecyclerView.ViewHolder {
 
     int icon = getIcon(filter);
     this.icon.setImageDrawable(DrawableUtil.getWrapped(activity, icon));
-    DrawableCompat.setTint(this.icon.getDrawable(), getColor(filter));
+    this.icon.getDrawable().setTint(getColor(filter));
     text.setText(filter.listingTitle);
 
     if (count == null || count == 0) {

app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -24,7 +24,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
 import butterknife.BindView;
 import butterknife.OnItemSelected;
 import com.google.common.base.Strings;
@@ -154,11 +153,8 @@ public class RepeatControlSet extends TaskEditControlFragment {
             return tv;
           }
         };
-    Drawable drawable =
-        DrawableCompat.wrap(
-            context.getDrawable(R.drawable.textfield_underline_black));
-    drawable.mutate();
-    DrawableCompat.setTint(drawable, context.getColor(R.color.text_primary));
+    Drawable drawable = context.getDrawable(R.drawable.textfield_underline_black).mutate();
+    drawable.setTint(context.getColor(R.color.text_primary));
     typeSpinner.setBackgroundDrawable(drawable);
     typeSpinner.setAdapter(typeAdapter);
     typeSpinner.setSelection(repeatAfterCompletion ? TYPE_COMPLETION_DATE : TYPE_DUE_DATE);

app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java

@@ -12,7 +12,6 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
-import androidx.core.graphics.drawable.DrawableCompat;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -168,18 +167,16 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA
     if (selectedColor == 0) {
       themeColor = this.themeColor;
       DrawableUtil.setLeftDrawable(this, color, R.drawable.ic_outline_not_interested_24px);
-      DrawableCompat.setTint(
-          getLeftDrawable(color), getColor(R.color.icon_tint_with_alpha));
+      getLeftDrawable(color).setTint(getColor(R.color.icon_tint_with_alpha));
       clear.setVisibility(View.GONE);
     } else {
       themeColor = colorProvider.getThemeColor(selectedColor, true);
       DrawableUtil.setLeftDrawable(this, color, R.drawable.color_picker);
       Drawable leftDrawable = getLeftDrawable(color);
-      DrawableCompat.setTint(
-          leftDrawable instanceof LayerDrawable
+      (leftDrawable instanceof LayerDrawable
               ? ((LayerDrawable) leftDrawable).getDrawable(0)
-              : leftDrawable,
-          themeColor.getPrimaryColor());
+              : leftDrawable)
+          .setTint(themeColor.getPrimaryColor());
       clear.setVisibility(View.VISIBLE);
     }
     themeColor.apply(toolbar);
@@ -189,7 +186,6 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA
       icon = CustomIcons.getIconResId(CustomIcons.getCLOUD());
     }
     DrawableUtil.setLeftDrawable(this, this.icon, icon);
-    DrawableCompat.setTint(
-        getLeftDrawable(this.icon), getColor(R.color.icon_tint_with_alpha));
+    getLeftDrawable(this.icon).setTint(getColor(R.color.icon_tint_with_alpha));
   }
 }

app/src/main/java/org/tasks/fragments/CommentBarFragment.java

@@ -20,7 +20,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -223,10 +222,8 @@ public class CommentBarFragment extends TaskEditControlFragment {
   private void resetPictureButton() {
     TypedValue typedValue = new TypedValue();
     getActivity().getTheme().resolveAttribute(R.attr.colorOnPrimary, typedValue, true);
-    Drawable drawable =
-        DrawableCompat.wrap(getContext().getDrawable(R.drawable.ic_outline_photo_camera_24px));
-    drawable.mutate();
-    DrawableCompat.setTint(drawable, typedValue.data);
+    Drawable drawable = getContext().getDrawable(R.drawable.ic_outline_photo_camera_24px).mutate();
+    drawable.setTint(typedValue.data);
     pictureButton.setImageDrawable(drawable);
   }
 

app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt

@@ -32,8 +32,8 @@ abstract class InjectingPreferenceFragment : PreferenceFragmentCompat() {
                 }
             } else {
                 if (pref.icon != null) {
-                    pref.icon = DrawableUtil.wrap(pref.icon)
-                    DrawableCompat.setTint(pref.icon, color)
+                    pref.icon = pref.icon.mutate()
+                    pref.icon.setTint(color)
                 }
             }
         }

app/src/main/java/org/tasks/locale/Locale.java

@@ -4,11 +4,11 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.ViewParent;
 import androidx.annotation.Nullable;
-import androidx.core.text.TextUtilsCompat;
 import androidx.preference.PreferenceManager;
 import com.google.common.base.Strings;
 import java.io.Serializable;
@@ -42,10 +42,10 @@ public class Locale implements Serializable {
       appLocale = deviceLocale;
     }
 
-    appDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(appLocale);
+    appDirectionality = TextUtils.getLayoutDirectionFromLocale(appLocale);
     appDirectionalityMark =
         appDirectionality == View.LAYOUT_DIRECTION_RTL ? RIGHT_TO_LEFT_MARK : LEFT_TO_RIGHT_MARK;
-    int deviceDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(deviceLocale);
+    int deviceDirectionality = TextUtils.getLayoutDirectionFromLocale(deviceLocale);
     hasUserOverrides =
         !(deviceLocale.equals(appLocale) && appDirectionality == deviceDirectionality);
   }

app/src/main/java/org/tasks/location/LocationPickerAdapter.java

@@ -8,7 +8,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.recyclerview.widget.DiffUtil.ItemCallback;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
@@ -111,7 +110,7 @@ public class LocationPickerAdapter extends ListAdapter<PlaceUsage, PlaceViewHold
       String address = place.getDisplayAddress();
       Drawable wrapped = DrawableUtil.getWrapped(itemView.getContext(), icon);
       this.icon.setImageDrawable(wrapped);
-      DrawableCompat.setTint(this.icon.getDrawable(), color);
+      this.icon.getDrawable().setTint(color);
       this.name.setText(name);
       if (Strings.isNullOrEmpty(address) || address.equals(name)) {
         this.address.setVisibility(View.GONE);

app/src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java

@@ -1,7 +1,6 @@
 package org.tasks.preferences;
 
 import android.app.Activity;
-import androidx.core.app.ActivityCompat;
 import javax.inject.Inject;
 
 public class ActivityPermissionRequestor extends PermissionRequestor {
@@ -17,6 +16,6 @@ public class ActivityPermissionRequestor extends PermissionRequestor {
 
   @Override
   protected void requestPermissions(int rc, String... permissions) {
-    ActivityCompat.requestPermissions(activity, permissions, rc);
+    activity.requestPermissions(permissions, rc);
   }
 }

app/src/main/java/org/tasks/preferences/PermissionChecker.java

@@ -6,7 +6,6 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastQ;
 import android.Manifest.permission;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import androidx.core.app.ActivityCompat;
 import javax.inject.Inject;
 import org.tasks.injection.ForApplication;
 import timber.log.Timber;
@@ -40,8 +39,7 @@ public class PermissionChecker {
 
   private boolean checkPermissions(String... permissions) {
     for (String permission : permissions) {
-      if (ActivityCompat.checkSelfPermission(context, permission)
-          != PackageManager.PERMISSION_GRANTED) {
+      if (context.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
         Timber.w("Request for %s denied", permission);
         return false;
       }

app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java

@@ -38,7 +38,6 @@ import android.widget.TextView;
 import android.widget.ToggleButton;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnItemSelected;
@@ -314,7 +313,7 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
       int paddingTop = weekButton.getPaddingTop();
       int paddingLeft = weekButton.getPaddingLeft();
       int paddingRight = weekButton.getPaddingRight();
-      ViewCompat.setBackground(weekButton, stateListDrawable);
+      weekButton.setBackground(stateListDrawable);
       weekButton.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
 
       int dayOfWeek = dayOfWeekCalendar.get(Calendar.DAY_OF_WEEK);

app/src/main/java/org/tasks/sync/AddAccountDialog.java

@@ -11,7 +11,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
 import org.tasks.R;
 import org.tasks.caldav.CaldavAccountSettingsActivity;
@@ -44,8 +43,7 @@ public class AddAccountDialog {
             ImageView icon = view.findViewById(R.id.image_view);
             icon.setImageDrawable(DrawableUtil.getWrapped(getContext(), icons[position]));
             if (position == 1) {
-              DrawableCompat.setTint(
-                  icon.getDrawable(), getContext().getColor(R.color.icon_tint));
+              icon.getDrawable().setTint(getContext().getColor(R.color.icon_tint));
             }
             return view;
           }

app/src/main/java/org/tasks/tags/CheckBoxTriStates.java

@@ -11,7 +11,6 @@ import android.widget.CompoundButton;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatCheckBox;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import org.tasks.R;
 
 public class CheckBoxTriStates extends AppCompatCheckBox {
@@ -119,7 +118,7 @@ public class CheckBoxTriStates extends AppCompatCheckBox {
         ? getContext().getColor(R.color.icon_tint)
         : getData(getContext(), R.attr.colorAccent);
     drawable = original.mutate();
-    DrawableCompat.setTint(drawable, color);
+    drawable.setTint(color);
     drawable.setAlpha(alpha);
     setButtonDrawable(drawable);
   }

app/src/main/java/org/tasks/themes/DrawableUtil.java

@@ -5,12 +5,10 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.widget.TextView;
 import androidx.annotation.DrawableRes;
-import androidx.core.graphics.drawable.DrawableCompat;
-import org.jetbrains.annotations.NotNull;
 
 public class DrawableUtil {
   public static Drawable getWrapped(Context context, @DrawableRes int resId) {
-    return wrap(context.getDrawable(resId));
+    return context.getDrawable(resId).mutate();
   }
 
   public static void setLeftDrawable(Context context, TextView tv, @DrawableRes int resId) {
@@ -27,13 +25,8 @@ public class DrawableUtil {
     return tv.getCompoundDrawablesRelative()[0];
   }
 
-  public static Drawable wrap(@NotNull Drawable icon) {
-    return DrawableCompat.wrap(icon.mutate());
-  }
-
   public static void setTint(Drawable drawable, int tint) {
-    DrawableCompat.setTint(
-        drawable instanceof LayerDrawable ? ((LayerDrawable) drawable).getDrawable(0) : drawable,
-        tint);
+    (drawable instanceof LayerDrawable ? ((LayerDrawable) drawable).getDrawable(0) : drawable)
+        .setTint(tint);
   }
 }

app/src/main/java/org/tasks/ui/CheckBoxProvider.kt

@@ -34,8 +34,8 @@ class CheckBoxProvider @Inject constructor(@ForActivity private val context: Con
 
     private fun getDrawable(@DrawableRes resId: Int, priority: Int): Drawable {
         val original = context.getDrawable(resId)
-        val wrapped = DrawableCompat.wrap(original!!.mutate())
-        DrawableCompat.setTint(wrapped, colorProvider.getPriorityColor(priority))
+        val wrapped = original!!.mutate()
+        wrapped.setTint(colorProvider.getPriorityColor(priority))
         return wrapped
     }
 

app/src/main/java/org/tasks/ui/PriorityControlSet.java

@@ -8,7 +8,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatRadioButton;
-import androidx.core.widget.CompoundButtonCompat;
 import butterknife.BindView;
 import butterknife.OnClick;
 import com.todoroo.astrid.data.Task;
@@ -111,8 +110,7 @@ public class PriorityControlSet extends TaskEditControlFragment {
 
   private void tintRadioButton(AppCompatRadioButton radioButton, int priority) {
     int color = colorProvider.getPriorityColor(priority, true);
-    CompoundButtonCompat.setButtonTintList(
-        radioButton,
+    radioButton.setButtonTintList(
         new ColorStateList(
             new int[][] {
               new int[] {-android.R.attr.state_checked}, new int[] {android.R.attr.state_checked}

app/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java

@@ -23,7 +23,6 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
-import androidx.core.view.ViewCompat;
 import org.tasks.R;
 
 /**
@@ -68,7 +67,7 @@ public class ScrimInsetsFrameLayout extends FrameLayout {
   protected boolean fitSystemWindows(Rect insets) {
     mInsets = new Rect(insets);
     setWillNotDraw(mInsetForeground == null);
-    ViewCompat.postInvalidateOnAnimation(this);
+    postInvalidateOnAnimation();
     if (mOnInsetsCallback != null) {
       mOnInsetsCallback.onInsetsChanged(insets);
     }

app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java

@@ -9,7 +9,6 @@ import android.widget.CheckedTextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import java.util.List;
 import org.tasks.R;
 
@@ -34,7 +33,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
     int drawable = getDrawable();
     if (drawable > 0) {
       Drawable original = context.getDrawable(drawable);
-      Drawable wrapped = DrawableCompat.wrap(original.mutate());
+      Drawable wrapped = original.mutate();
       int color = getDrawableColor(position);
       if (color == 0) {
         color = tint;
@@ -42,7 +41,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
       } else if (color == -1) {
         wrapped.setAlpha(0);
       }
-      DrawableCompat.setTint(wrapped, color);
+      wrapped.setTint(color);
       view.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null);
     }
     return view;