diff --git a/app/src/debug/java/org/tasks/preferences/fragments/Debug.kt b/app/src/debug/java/org/tasks/preferences/fragments/Debug.kt index 083bdb1b4..c3cc66a94 100644 --- a/app/src/debug/java/org/tasks/preferences/fragments/Debug.kt +++ b/app/src/debug/java/org/tasks/preferences/fragments/Debug.kt @@ -36,7 +36,7 @@ class Debug : InjectingPreferenceFragment() { } findPreference(R.string.debug_reset_ssl).setOnPreferenceClickListener { - resetCertificates(context!!) + resetCertificates(requireContext()) toaster.longToast("SSL certificates reset") false } diff --git a/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java index 7665d2dae..660e98729 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java +++ b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java @@ -12,7 +12,6 @@ import android.content.Context; import android.os.Bundle; import android.view.MenuItem; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -91,7 +90,7 @@ public class BeastModePreferences extends ThemedInjectingAppCompatActivity ButterKnife.bind(this); toolbar.setNavigationIcon( - ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px)); + getDrawable(R.drawable.ic_outline_arrow_back_24px)); toolbar.setNavigationOnClickListener(v -> finish()); toolbar.inflateMenu(R.menu.beast_mode); toolbar.setOnMenuItemClickListener(this); diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index eebf82808..de53bab66 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -33,7 +33,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.google.android.material.appbar.AppBarLayout; @@ -135,7 +134,7 @@ public final class TaskEditFragment extends InjectingFragment ThemeColor themeColor = arguments.getParcelable(EXTRA_THEME); Toolbar toolbar = binding.toolbar; - toolbar.setNavigationIcon(ContextCompat.getDrawable(context, R.drawable.ic_outline_save_24px)); + toolbar.setNavigationIcon(context.getDrawable(R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); boolean backButtonSavesTask = preferences.backButtonSavesTask(); diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 60c7bd742..3bd5e8e6b 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -7,13 +7,11 @@ package com.todoroo.astrid.activity; import static android.app.Activity.RESULT_OK; -import static androidx.core.content.ContextCompat.getColor; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.todoroo.andlib.utility.AndroidUtilities.assertMainThread; import static org.tasks.activities.RemoteListPicker.newRemoteListSupportPicker; import static org.tasks.caldav.CaldavCalendarSettingsActivity.EXTRA_CALDAV_CALENDAR; -import static org.tasks.date.DateTimeUtils.newDateTime; import android.app.Activity; import android.content.BroadcastReceiver; @@ -539,9 +537,9 @@ public final class TaskListFragment extends InjectingFragment private Snackbar makeSnackbar(String text) { Snackbar snackbar = Snackbar.make(coordinatorLayout, text, 8000) - .setTextColor(getColor(context, R.color.snackbar_text_color)) - .setActionTextColor(getColor(context, R.color.snackbar_action_color)); - snackbar.getView().setBackgroundColor(getColor(context, R.color.snackbar_background)); + .setTextColor(context.getColor(R.color.snackbar_text_color)) + .setActionTextColor(context.getColor(R.color.snackbar_action_color)); + snackbar.getView().setBackgroundColor(context.getColor(R.color.snackbar_background)); return snackbar; } diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java index d42784d6d..17d70fa71 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java +++ b/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.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -112,7 +111,7 @@ public class FilterViewHolder extends RecyclerView.ViewHolder { return color.getPrimaryColor(); } } - return ContextCompat.getColor(activity, R.color.text_primary); + return activity.getColor(R.color.text_primary); } private int getIcon(FilterListItem filter) { diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt b/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt index 9f1938e56..97ffaf152 100644 --- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt +++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt @@ -3,7 +3,6 @@ package com.todoroo.astrid.core import android.content.Context import android.graphics.Canvas import android.graphics.drawable.ColorDrawable -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import org.tasks.Callback @@ -47,7 +46,7 @@ class CustomFilterItemTouchHelper( override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { val itemView = viewHolder.itemView - val background = ColorDrawable(ContextCompat.getColor(context, R.color.overdue)) + val background = ColorDrawable(context.getColor(R.color.overdue)) if (dX > 0) { background.setBounds(0, itemView.top, itemView.left + dX.toInt(), itemView.bottom) } else if (dX < 0) { diff --git a/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java index d03843de4..b7afa349a 100644 --- a/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -6,8 +6,6 @@ package com.todoroo.astrid.provider; -import static androidx.core.content.ContextCompat.getColor; - import android.content.ContentValues; import android.content.Context; import android.content.UriMatcher; @@ -191,7 +189,7 @@ public class Astrid2TaskProvider extends InjectingContentProvider { } private static int getPriorityColor(Context context, int priority) { - return getColor(context, getPriorityResId(priority)); + return context.getColor(getPriorityResId(priority)); } @ColorRes private static int getPriorityResId(int priority) { diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 02b73fa6a..3b9860e24 100644 --- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.repeats; -import static androidx.core.content.ContextCompat.getColor; import static com.google.common.collect.Lists.newArrayList; import static com.google.ical.values.Frequency.MONTHLY; import static org.tasks.repeats.BasicRecurrenceDialog.newBasicRecurrenceDialog; @@ -25,7 +24,6 @@ import android.widget.Spinner; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import butterknife.BindView; import butterknife.OnItemSelected; @@ -158,9 +156,9 @@ public class RepeatControlSet extends TaskEditControlFragment { }; Drawable drawable = DrawableCompat.wrap( - ContextCompat.getDrawable(context, R.drawable.textfield_underline_black)); + context.getDrawable(R.drawable.textfield_underline_black)); drawable.mutate(); - DrawableCompat.setTint(drawable, getColor(context, R.color.text_primary)); + DrawableCompat.setTint(drawable, context.getColor(R.color.text_primary)); typeSpinner.setBackgroundDrawable(drawable); typeSpinner.setAdapter(typeAdapter); typeSpinner.setSelection(repeatAfterCompletion ? TYPE_COMPLETION_DATE : TYPE_DUE_DATE); diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java index ea6bc9991..ec6d4afef 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java +++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java @@ -6,9 +6,7 @@ import static com.google.common.collect.Lists.newArrayList; import static org.tasks.db.DbUtils.batch; import android.content.Context; -import android.os.Environment; import androidx.annotation.ColorRes; -import androidx.core.content.ContextCompat; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; @@ -22,7 +20,6 @@ import java.util.List; import javax.inject.Inject; import net.fortuna.ical4j.model.property.Geo; import org.tasks.R; -import org.tasks.analytics.Tracker; import org.tasks.caldav.iCalendar; import org.tasks.data.CaldavCalendar; import org.tasks.data.CaldavDao; @@ -174,7 +171,7 @@ public class Upgrader { public static int getAndroidColor(Context context, int index) { int legacyColor = getLegacyColor(index, 0); - return legacyColor == 0 ? 0 : ContextCompat.getColor(context, legacyColor); + return legacyColor == 0 ? 0 : context.getColor(legacyColor); } public static @ColorRes int getLegacyColor(int index, int def) { diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java index 772d98ad9..2b51e63da 100644 --- a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java +++ b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java @@ -10,7 +10,6 @@ import static com.google.common.collect.Lists.newArrayList; import static java.util.Collections.emptyList; import android.content.Context; -import android.content.res.Resources; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.astrid.api.Filter; @@ -38,10 +37,9 @@ public final class TimerFilterExposer { } public static Filter createFilter(Context context) { - Resources r = context.getResources(); Filter filter = new Filter( - r.getString(R.string.TFE_workingOn), + context.getString(R.string.TFE_workingOn), new QueryTemplate() .where(Criterion.and(Task.TIMER_START.gt(0), Task.DELETION_DATE.eq(0)))); filter.icon = R.drawable.ic_outline_timer_24px; diff --git a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index b67cee2b0..388e2a5ba 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.ui; -import static androidx.core.content.ContextCompat.getColor; import static com.todoroo.astrid.data.Task.HIDE_UNTIL_DAY_BEFORE; import static com.todoroo.astrid.data.Task.HIDE_UNTIL_DUE; import static com.todoroo.astrid.data.Task.HIDE_UNTIL_NONE; @@ -121,11 +120,11 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt if (value.setting == Task.HIDE_UNTIL_NONE) { clearButton.setVisibility(View.GONE); tv.setText(value.labelDisplay); - tv.setTextColor(getColor(context, R.color.text_tertiary)); + tv.setTextColor(context.getColor(R.color.text_tertiary)); } else { String display = value.labelDisplay; tv.setText(getString(R.string.TEA_hideUntil_display, display)); - tv.setTextColor(getColor(context, R.color.text_primary)); + tv.setTextColor(context.getColor(R.color.text_primary)); } return tv; } diff --git a/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java index 2bd7f4abd..c615802fb 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java +++ b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java @@ -7,7 +7,6 @@ package com.todoroo.astrid.ui; import android.content.Context; -import android.content.res.Resources; import android.text.format.DateUtils; import android.view.View; import android.widget.TextView; @@ -43,9 +42,8 @@ public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnC timeDuration = timeDurationInSeconds; - Resources r = context.getResources(); if (timeDurationInSeconds == 0) { - timeButton.setText(r.getString(R.string.WID_dateButtonUnset)); + timeButton.setText(context.getString(R.string.WID_dateButtonUnset)); return; } @@ -69,7 +67,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnC new NNumberPickerDialog( context, this, - context.getResources().getString(R.string.DLG_hour_minutes), + context.getString(R.string.DLG_hour_minutes), new int[] {0, 0}, new int[] {1, 5}, new int[] {0, 0}, diff --git a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java index d3863d886..5bb2e5605 100644 --- a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java +++ b/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.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import butterknife.BindView; import butterknife.ButterKnife; @@ -73,7 +72,7 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA } toolbar.setTitle(getToolbarTitle()); - toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); + toolbar.setNavigationIcon(getDrawable(R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); if (!isNew()) { toolbar.inflateMenu(R.menu.menu_tag_settings); @@ -170,7 +169,7 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA themeColor = this.themeColor; DrawableUtil.setLeftDrawable(this, color, R.drawable.ic_outline_not_interested_24px); DrawableCompat.setTint( - getLeftDrawable(color), ContextCompat.getColor(this, R.color.icon_tint_with_alpha)); + getLeftDrawable(color), getColor(R.color.icon_tint_with_alpha)); clear.setVisibility(View.GONE); } else { themeColor = colorProvider.getThemeColor(selectedColor, true); @@ -191,6 +190,6 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA } DrawableUtil.setLeftDrawable(this, this.icon, icon); DrawableCompat.setTint( - getLeftDrawable(this.icon), ContextCompat.getColor(this, R.color.icon_tint_with_alpha)); + getLeftDrawable(this.icon), getColor(R.color.icon_tint_with_alpha)); } } diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java index da37b856a..58690bf2e 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java @@ -14,7 +14,6 @@ import android.view.inputmethod.InputMethodManager; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import at.bitfire.dav4jvm.exception.HttpException; import butterknife.ButterKnife; import butterknife.OnFocusChange; @@ -94,7 +93,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA toolbar.setTitle( caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName()); - toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); + toolbar.setNavigationIcon(getDrawable(R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); toolbar.inflateMenu(R.menu.menu_caldav_account_settings); toolbar.setOnMenuItemClickListener(this); @@ -299,11 +298,11 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA private Snackbar newSnackbar(String message) { Snackbar snackbar = Snackbar.make(binding.rootLayout, message, 8000) - .setTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color)) - .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_action_color)); + .setTextColor(getColor(R.color.snackbar_text_color)) + .setActionTextColor(getColor(R.color.snackbar_action_color)); snackbar .getView() - .setBackgroundColor(ContextCompat.getColor(this, R.color.snackbar_background)); + .setBackgroundColor(getColor(R.color.snackbar_background)); return snackbar; } diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java index 99d93a43c..cd44c39c5 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.ProgressBar; -import androidx.core.content.ContextCompat; import at.bitfire.dav4jvm.exception.HttpException; import butterknife.BindView; import butterknife.OnTextChanged; @@ -174,11 +173,11 @@ public abstract class BaseCaldavCalendarSettingsActivity extends BaseListSetting private void showSnackbar(String message) { Snackbar snackbar = Snackbar.make(root, message, 8000) - .setTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color)) - .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_action_color)); + .setTextColor(getColor(R.color.snackbar_text_color)) + .setActionTextColor(getColor(R.color.snackbar_action_color)); snackbar .getView() - .setBackgroundColor(ContextCompat.getColor(this, R.color.snackbar_background)); + .setBackgroundColor(getColor(R.color.snackbar_background)); snackbar.show(); } diff --git a/app/src/main/java/org/tasks/dialogs/ColorPalettePicker.kt b/app/src/main/java/org/tasks/dialogs/ColorPalettePicker.kt index 4bec0a106..1bae9f890 100644 --- a/app/src/main/java/org/tasks/dialogs/ColorPalettePicker.kt +++ b/app/src/main/java/org/tasks/dialogs/ColorPalettePicker.kt @@ -8,7 +8,6 @@ import android.content.Intent import android.os.Bundle import android.os.Parcelable import android.view.LayoutInflater -import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView import butterknife.BindView @@ -84,7 +83,7 @@ class ColorPalettePicker : InjectingDialogFragment() { Palette.COLORS -> colorProvider.getThemeColors() Palette.ACCENTS -> colorProvider.getAccentColors() Palette.LAUNCHERS -> ThemeColor.LAUNCHER_COLORS.map { color -> - ThemeColor(context, ContextCompat.getColor(requireContext(), color)) + ThemeColor(context, requireContext().getColor(color)) } Palette.WIDGET -> colorProvider.getWidgetColors() } diff --git a/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java b/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java index 6ee2a000e..1cc607ddb 100644 --- a/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java +++ b/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java @@ -5,7 +5,6 @@ import static org.tasks.preferences.ResourceResolver.getData; import android.app.Activity; import android.view.ViewGroup; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.core.content.res.ResourcesCompat; import androidx.recyclerview.widget.DiffUtil.ItemCallback; import androidx.recyclerview.widget.ListAdapter; @@ -46,7 +45,7 @@ class IconPickerAdapter extends ListAdapter { if (icon != null) { int tint = index == current ? getData(activity, R.attr.colorAccent) - : ContextCompat.getColor(activity, R.color.icon_tint); + : activity.getColor(R.color.icon_tint); boolean available = index < 1000 || inventory.hasPro(); float alpha = ResourcesCompat.getFloat( diff --git a/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt b/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt index ec2675ecd..381baf08d 100644 --- a/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt +++ b/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt @@ -12,7 +12,6 @@ import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.TextView import androidx.appcompat.app.AlertDialog -import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import org.tasks.R import org.tasks.billing.Inventory @@ -72,7 +71,7 @@ class ThemePickerDialog : InjectingDialogFragment() { R.color.text_tertiary } val text: TextView = view.findViewById(R.id.text1) - text.setTextColor(ContextCompat.getColor(context, textColor)) + text.setTextColor(context.getColor(textColor)) return view } } diff --git a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java index 37723b537..25301fe7e 100644 --- a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java @@ -9,7 +9,6 @@ import android.view.MenuItem; import android.view.View; import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; -import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import at.bitfire.dav4jvm.exception.HttpException; import butterknife.ButterKnife; @@ -70,7 +69,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity Toolbar toolbar = binding.toolbar.toolbar; toolbar.setTitle( caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName()); - toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); + toolbar.setNavigationIcon(getDrawable(R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); toolbar.inflateMenu(R.menu.menu_etesync_encryption_settings); toolbar.setOnMenuItemClickListener(this); @@ -177,11 +176,11 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity private Snackbar newSnackbar(String message) { Snackbar snackbar = Snackbar.make(binding.rootLayout, message, 8000) - .setTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color)) - .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_action_color)); + .setTextColor(getColor(R.color.snackbar_text_color)) + .setActionTextColor(getColor(R.color.snackbar_action_color)); snackbar .getView() - .setBackgroundColor(ContextCompat.getColor(this, R.color.snackbar_background)); + .setBackgroundColor(getColor(R.color.snackbar_background)); return snackbar; } diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java index 9e9ec4919..d9b70bca4 100644 --- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java +++ b/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.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import butterknife.BindView; import butterknife.ButterKnife; @@ -225,8 +224,7 @@ public class CommentBarFragment extends TaskEditControlFragment { TypedValue typedValue = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.colorOnPrimary, typedValue, true); Drawable drawable = - DrawableCompat.wrap( - ContextCompat.getDrawable(getContext(), R.drawable.ic_outline_photo_camera_24px)); + DrawableCompat.wrap(getContext().getDrawable(R.drawable.ic_outline_photo_camera_24px)); drawable.mutate(); DrawableCompat.setTint(drawable, typedValue.data); pictureButton.setImageDrawable(drawable); diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt b/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt index 5aff279d2..63ef9e122 100644 --- a/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt +++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt @@ -5,7 +5,6 @@ import android.content.DialogInterface import android.content.Intent import android.os.Bundle import androidx.annotation.StringRes -import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat @@ -48,7 +47,7 @@ abstract class InjectingPreferenceFragment : PreferenceFragmentCompat() { final override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(getPreferenceXml(), rootKey) - tintIcons(preferenceScreen, ContextCompat.getColor(requireContext(), R.color.icon_tint_with_alpha)) + tintIcons(preferenceScreen, requireContext().getColor(R.color.icon_tint_with_alpha)) setupPreferences(savedInstanceState) } diff --git a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java index 13028552b..7bbc3537c 100755 --- a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java +++ b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java @@ -5,7 +5,6 @@ import android.net.Uri; import android.os.Bundle; import android.view.MenuItem; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import javax.inject.Inject; import net.dinglisch.android.tasker.TaskerPlugin; import org.tasks.LocalBroadcastManager; @@ -35,7 +34,7 @@ public final class TaskerCreateTaskActivity extends AbstractFragmentPluginAppCom Toolbar toolbar = binding.toolbar.toolbar; toolbar.setTitle(R.string.tasker_create_task); - toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); + toolbar.setNavigationIcon(getDrawable(R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); toolbar.setOnMenuItemClickListener(this); toolbar.inflateMenu(R.menu.menu_tasker_create_task); diff --git a/app/src/main/java/org/tasks/location/LocationPickerAdapter.java b/app/src/main/java/org/tasks/location/LocationPickerAdapter.java index 5116e8eba..6ade1159e 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerAdapter.java +++ b/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.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.recyclerview.widget.DiffUtil.ItemCallback; import androidx.recyclerview.widget.ListAdapter; @@ -70,7 +69,7 @@ public class LocationPickerAdapter extends ListAdapter { return themeColor.getPrimaryColor(); } } - return ContextCompat.getColor(context, R.color.icon_tint_with_alpha); + return context.getColor(R.color.icon_tint_with_alpha); } private @Nullable Integer getIcon(TagData tagData) { diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolder.java b/app/src/main/java/org/tasks/tasklist/ViewHolder.java index c0f630678..1d9163586 100644 --- a/app/src/main/java/org/tasks/tasklist/ViewHolder.java +++ b/app/src/main/java/org/tasks/tasklist/ViewHolder.java @@ -10,7 +10,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.MarginLayoutParams; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; @@ -223,12 +222,11 @@ public class ViewHolder extends RecyclerView.ViewHolder { private void setupTitleAndCheckbox() { if (task.isCompleted()) { - nameView.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary)); + nameView.setTextColor(context.getColor(R.color.text_tertiary)); nameView.setPaintFlags(nameView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); } else { nameView.setTextColor( - ContextCompat.getColor( - context, task.isHidden() ? R.color.text_tertiary : R.color.text_primary)); + context.getColor(task.isHidden() ? R.color.text_tertiary : R.color.text_primary)); nameView.setPaintFlags(nameView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); } diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java index ef8439e11..aae09503d 100644 --- a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java +++ b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java @@ -1,6 +1,5 @@ package org.tasks.tasklist; -import static androidx.core.content.ContextCompat.getColor; import static com.todoroo.andlib.utility.AndroidUtilities.convertDpToPixels; import static org.tasks.preferences.ResourceResolver.getData; import static org.tasks.preferences.ResourceResolver.getResourceId; @@ -50,7 +49,7 @@ public class ViewHolderFactory { this.preferences = preferences; this.linkify = linkify; textColorSecondary = getData(context, android.R.attr.textColorSecondary); - textColorOverdue = getColor(context, R.color.overdue); + textColorOverdue = context.getColor(R.color.overdue); background = getResourceId(context, R.attr.selectableItemBackground); selectedColor = getData(context, R.attr.colorControlHighlight); fontSize = preferences.getFontSize(); diff --git a/app/src/main/java/org/tasks/themes/ColorProvider.kt b/app/src/main/java/org/tasks/themes/ColorProvider.kt index b0643c49b..e623e01e2 100644 --- a/app/src/main/java/org/tasks/themes/ColorProvider.kt +++ b/app/src/main/java/org/tasks/themes/ColorProvider.kt @@ -2,7 +2,6 @@ package org.tasks.themes import android.content.Context import androidx.annotation.ColorInt -import androidx.core.content.ContextCompat import org.tasks.R import org.tasks.injection.ForActivity import org.tasks.preferences.Preferences @@ -96,7 +95,7 @@ class ColorProvider @Inject constructor(@ForActivity private val context: Contex }) fun getThemeColors(adjust: Boolean = true) = ThemeColor.COLORS.map { c -> - getThemeColor(ContextCompat.getColor(context, c), adjust) + getThemeColor(context.getColor(c), adjust) } fun getWidgetColors() = getThemeColors(false) diff --git a/app/src/main/java/org/tasks/themes/DrawableUtil.java b/app/src/main/java/org/tasks/themes/DrawableUtil.java index 1794038dd..cc14a1c37 100644 --- a/app/src/main/java/org/tasks/themes/DrawableUtil.java +++ b/app/src/main/java/org/tasks/themes/DrawableUtil.java @@ -5,13 +5,12 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.widget.TextView; import androidx.annotation.DrawableRes; -import androidx.core.content.ContextCompat; 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(ContextCompat.getDrawable(context, resId)); + return wrap(context.getDrawable(resId)); } public static void setLeftDrawable(Context context, TextView tv, @DrawableRes int resId) { diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java index 8faa38e45..649aaa868 100644 --- a/app/src/main/java/org/tasks/themes/ThemeColor.java +++ b/app/src/main/java/org/tasks/themes/ThemeColor.java @@ -18,7 +18,6 @@ import android.view.View; import androidx.annotation.ColorInt; import androidx.annotation.RequiresApi; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import androidx.core.os.ParcelCompat; import androidx.drawerlayout.widget.DrawerLayout; @@ -186,11 +185,11 @@ public class ThemeColor implements Pickable { double contrast = ColorUtils.calculateContrast(WHITE, colorPrimary); isDark = contrast < 3; if (isDark) { - colorOnPrimary = context.getResources().getColor(R.color.black_87); - hintOnPrimary = context.getResources().getColor(R.color.black_60); + colorOnPrimary = context.getColor(R.color.black_87); + hintOnPrimary = context.getColor(R.color.black_60); } else { colorOnPrimary = WHITE; - hintOnPrimary = context.getResources().getColor(R.color.white_60); + hintOnPrimary = context.getColor(R.color.white_60); } } @@ -204,7 +203,7 @@ public class ThemeColor implements Pickable { } public static ThemeColor getLauncherColor(Context context, int index) { - return new ThemeColor(context, ContextCompat.getColor(context, LAUNCHER_COLORS[index])); + return new ThemeColor(context, context.getColor(LAUNCHER_COLORS[index])); } private static void colorMenu(Menu menu, int color) { diff --git a/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt b/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt index 199569116..f57954aa4 100644 --- a/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt +++ b/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt @@ -5,7 +5,6 @@ import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.drawable.Drawable import androidx.annotation.DrawableRes -import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import com.todoroo.astrid.data.Task import org.tasks.R @@ -34,7 +33,7 @@ class CheckBoxProvider @Inject constructor(@ForActivity private val context: Con } private fun getDrawable(@DrawableRes resId: Int, priority: Int): Drawable { - val original = ContextCompat.getDrawable(context, resId) + val original = context.getDrawable(resId) val wrapped = DrawableCompat.wrap(original!!.mutate()) DrawableCompat.setTint(wrapped, colorProvider.getPriorityColor(priority)) return wrapped diff --git a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java index 95a67915d..cee13c673 100644 --- a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java +++ b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java @@ -11,7 +11,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import butterknife.BindView; import com.todoroo.andlib.utility.DateUtilities; @@ -165,7 +164,7 @@ public class DeadlineControlSet extends TaskEditControlFragment { private void setTextColor(boolean overdue) { dueDate.setTextColor( - ContextCompat.getColor(context, overdue ? R.color.overdue : R.color.text_primary)); + context.getColor(overdue ? R.color.overdue : R.color.text_primary)); } public interface DueDateChangeListener { diff --git a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java index 6629d728d..59353ec30 100644 --- a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java +++ b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import android.widget.CheckedTextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.core.content.res.ResourcesCompat; import androidx.core.graphics.drawable.DrawableCompat; import java.util.List; @@ -25,7 +24,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter { this.context = context; this.alpha = (int) (255 * ResourcesCompat.getFloat(context.getResources(), R.dimen.alpha_secondary)); - this.tint = ContextCompat.getColor(context, R.color.icon_tint); + this.tint = context.getColor(R.color.icon_tint); } @NonNull @@ -34,7 +33,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter { CheckedTextView view = (CheckedTextView) super.getView(position, convertView, parent); int drawable = getDrawable(); if (drawable > 0) { - Drawable original = ContextCompat.getDrawable(context, drawable); + Drawable original = context.getDrawable(drawable); Drawable wrapped = DrawableCompat.wrap(original.mutate()); int color = getDrawableColor(position); if (color == 0) { diff --git a/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index 4d1b2107a..bb0df10d3 100644 --- a/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -1,7 +1,5 @@ package org.tasks.widget; -import static androidx.core.content.ContextCompat.getColor; - import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; @@ -10,7 +8,6 @@ import android.util.DisplayMetrics; import android.view.View; import android.widget.RemoteViews; import android.widget.RemoteViewsService; -import androidx.core.content.ContextCompat; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.dao.TaskDao; @@ -171,7 +168,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { row.setViewVisibility(R.id.widget_due_bottom, View.GONE); row.setViewVisibility(R.id.widget_due_end, View.GONE); if (task.hasDueDate() && task.isOverdue()) { - textColorTitle = getColor(context, R.color.overdue); + textColorTitle = context.getColor(R.color.overdue); } } if (showFullTaskTitle) { @@ -281,7 +278,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { context, task.getDueDate(), locale.getLocale(), FormatStyle.MEDIUM)); row.setTextColor( dueDateRes, - task.isOverdue() ? getColor(context, R.color.overdue) : textColorSecondary); + task.isOverdue() ? context.getColor(R.color.overdue) : textColorSecondary); row.setFloat(dueDateRes, "setTextSize", dueDateTextSize); if (handleDueDateClick) { row.setOnClickFillInIntent( @@ -306,9 +303,9 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { showFullDescription = widgetPreferences.showFullDescription(); isDark = widgetPreferences.getThemeIndex() > 0; textColorPrimary = - ContextCompat.getColor(context, isDark ? R.color.white_87 : R.color.black_87); + context.getColor(isDark ? R.color.white_87 : R.color.black_87); textColorSecondary = - ContextCompat.getColor(context, isDark ? R.color.white_60 : R.color.black_60); + context.getColor(isDark ? R.color.white_60 : R.color.black_60); int dueDatePosition = widgetPreferences.getDueDatePosition(); showDueDates = dueDatePosition != 2; endDueDate = dueDatePosition != 1; diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java index f61400027..c4e615aba 100644 --- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java +++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java @@ -10,7 +10,6 @@ import android.os.Parcelable; import android.view.View; import android.widget.TextView; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -71,7 +70,7 @@ public class ShortcutConfigActivity extends ThemedInjectingAppCompatActivity ButterKnife.bind(this); toolbar.setTitle(R.string.FSA_label); - toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); + toolbar.setNavigationIcon(getDrawable(R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); if (icicle == null) { diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.java b/app/src/main/java/org/tasks/widget/TasksWidget.java index 9108a1ff5..41f04d076 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidget.java +++ b/app/src/main/java/org/tasks/widget/TasksWidget.java @@ -12,7 +12,6 @@ import android.net.Uri; import android.view.View; import android.widget.RemoteViews; import androidx.annotation.ColorInt; -import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.Filter; @@ -139,7 +138,7 @@ public class TasksWidget extends InjectingAppWidgetProvider { } else { background = android.R.color.white; } - return ContextCompat.getColor(context, background); + return context.getColor(background); } private PendingIntent getPendingIntentTemplate(Context context) { diff --git a/app/src/main/java/org/tasks/widget/WidgetPreferences.java b/app/src/main/java/org/tasks/widget/WidgetPreferences.java index b8a8b8036..ac8cbdd90 100644 --- a/app/src/main/java/org/tasks/widget/WidgetPreferences.java +++ b/app/src/main/java/org/tasks/widget/WidgetPreferences.java @@ -1,7 +1,6 @@ package org.tasks.widget; import android.content.Context; -import androidx.core.content.ContextCompat; import com.todoroo.astrid.service.Upgrader; import org.tasks.R; import org.tasks.preferences.Preferences; @@ -81,7 +80,7 @@ public class WidgetPreferences { return color; } int index = getInt(R.string.p_widget_color, -1); - color = ContextCompat.getColor(context, Upgrader.getLegacyColor(index, R.color.blue_500)); + color = context.getColor(Upgrader.getLegacyColor(index, R.color.blue_500)); setInt(R.string.p_widget_color_v2, color); return color; }