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

Remove ContextCompat usage

Browse Source
pull/996/head
Alex Baker 4 years ago
parent 20434eb420
commit 7b1f2d1330
42 changed files with 69 additions and 118 deletions
Show Stats Download Patch File Download Diff File

2
app/src/debug/java/org/tasks/preferences/fragments/Debug.kt
Unescape Escape View File

@ -36,7 +36,7 @@ class Debug : InjectingPreferenceFragment() {
}
findPreference(R.string.debug_reset_ssl).setOnPreferenceClickListener {
resetCertificates(context!!)
resetCertificates(requireContext())
toaster.longToast("SSL certificates reset")
false
}

3
app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
Unescape Escape View File

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

3
app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

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

8
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -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;
}

3
app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
Unescape Escape View File

@ -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) {

3
app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt
Unescape Escape View File

@ -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) {

4
app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java
Unescape Escape View File

@ -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) {

6
app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
Unescape Escape View File

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

5
app/src/main/java/com/todoroo/astrid/service/Upgrader.java
Unescape Escape View File

@ -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) {

4
app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
Unescape Escape View File

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

5
app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
Unescape Escape View File

@ -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;
}

6
app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
Unescape Escape View File

@ -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},

7
app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java
Unescape Escape View File

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

9
app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java
Unescape Escape View File

@ -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;
}

7
app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java
Unescape Escape View File

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

3
app/src/main/java/org/tasks/dialogs/ColorPalettePicker.kt
Unescape Escape View File

@ -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()
}

3
app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java
Unescape Escape View File

@ -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<Integer, IconPickerHolder> {
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(

3
app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt
Unescape Escape View File

@ -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
}
}

9
app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java
Unescape Escape View File

@ -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;
}

4
app/src/main/java/org/tasks/fragments/CommentBarFragment.java
Unescape Escape View File

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

3
app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt
Unescape Escape View File

@ -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)
}

3
app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java
Unescape Escape View File

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

3
app/src/main/java/org/tasks/location/LocationPickerAdapter.java
Unescape Escape View File

@ -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<PlaceUsage, PlaceViewHold
return color.getPrimaryColor();
}
}
return ContextCompat.getColor(context, R.color.text_primary);
return context.getColor(R.color.text_primary);
}
private int getIcon(int index) {

6
app/src/main/java/org/tasks/notifications/NotificationManager.java
Unescape Escape View File

@ -310,7 +310,7 @@ public class NotificationManager {
snoozeIntent.putExtra(SnoozeActivity.EXTRA_TASK_IDS, taskIds);
builder.addAction(
R.drawable.ic_snooze_white_24dp,
context.getResources().getString(R.string.snooze_all),
context.getString(R.string.snooze_all),
PendingIntent.getActivity(context, 0, snoozeIntent, PendingIntent.FLAG_CANCEL_CURRENT));
notify(NotificationManager.SUMMARY_NOTIFICATION_ID, builder, notify, nonStop, fiveTimes);
@ -407,7 +407,7 @@ public class NotificationManager {
NotificationCompat.Action completeAction =
new NotificationCompat.Action.Builder(
R.drawable.ic_check_white_24dp,
context.getResources().getString(R.string.rmd_NoA_done),
context.getString(R.string.rmd_NoA_done),
completePendingIntent)
.build();
@ -443,7 +443,7 @@ public class NotificationManager {
.addAction(completeAction)
.addAction(
R.drawable.ic_snooze_white_24dp,
context.getResources().getString(R.string.rmd_NoA_snooze),
context.getString(R.string.rmd_NoA_snooze),
snoozePendingIntent)
.extend(wearableExtender);
}

3
app/src/main/java/org/tasks/preferences/BasePreferences.kt
Unescape Escape View File

@ -4,7 +4,6 @@ import android.content.Intent
import android.os.Bundle
import android.view.MenuItem
import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
@ -44,7 +43,7 @@ abstract class BasePreferences : ThemedInjectingAppCompatActivity(),
}
}
toolbar.navigationIcon =
ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px)
getDrawable(R.drawable.ic_outline_arrow_back_24px)
toolbar.setNavigationOnClickListener { onBackPressed() }
toolbar.setOnMenuItemClickListener(this)
themeColor.apply(toolbar)

2
app/src/main/java/org/tasks/preferences/Preferences.java
Unescape Escape View File

@ -224,7 +224,7 @@ public class Preferences {
}
public @Nullable String getStringValue(int keyResource) {
return prefs.getString(context.getResources().getString(keyResource), null);
return prefs.getString(context.getString(keyResource), null);
}
public boolean isStringValueSet(int keyResource) {

5
app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.repeats;
import static androidx.core.content.ContextCompat.getColor;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.ical.values.Frequency.DAILY;
import static com.google.ical.values.Frequency.HOURLY;
@ -289,7 +288,7 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
},
new int[] {
ResourceResolver.getData(context, R.attr.colorOnSecondary),
getColor(context, R.color.text_primary)
context.getColor(R.color.text_primary)
});
int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset);
int accentColor = ResourceResolver.getData(context, R.attr.colorAccent);
@ -301,7 +300,7 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
GradientDrawable ovalDrawable =
(GradientDrawable)
context.getResources().getDrawable(R.drawable.week_day_button_oval).mutate();
context.getDrawable(R.drawable.week_day_button_oval).mutate();
ovalDrawable.setColor(accentColor);
LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] {ovalDrawable});
layerDrawable.setLayerInset(0, inset, inset, inset, inset);

3
app/src/main/java/org/tasks/sync/AddAccountDialog.java
Unescape Escape View File

@ -11,7 +11,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 com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
import org.tasks.R;
@ -46,7 +45,7 @@ public class AddAccountDialog {
icon.setImageDrawable(DrawableUtil.getWrapped(getContext(), icons[position]));
if (position == 1) {
DrawableCompat.setTint(
icon.getDrawable(), ContextCompat.getColor(getContext(), R.color.icon_tint));
icon.getDrawable(), getContext().getColor(R.color.icon_tint));
}
return view;
}

4
app/src/main/java/org/tasks/tags/CheckBoxTriStates.java
Unescape Escape View File

@ -113,10 +113,10 @@ public class CheckBoxTriStates extends AppCompatCheckBox {
alpha = this.alpha;
break;
}
Drawable original = getResources().getDrawable(btnDrawable);
Drawable original = getContext().getDrawable(btnDrawable);
Drawable drawable;
int color = state == State.UNCHECKED
? getResources().getColor(R.color.icon_tint)
? getContext().getColor(R.color.icon_tint)
: getData(getContext(), R.attr.colorAccent);
drawable = original.mutate();
DrawableCompat.setTint(drawable, color);

3
app/src/main/java/org/tasks/tags/TagRecyclerAdapter.java
Unescape Escape View File

@ -6,7 +6,6 @@ import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.AsyncListDiffer;
import androidx.recyclerview.widget.RecyclerView;
import java.util.List;
@ -67,7 +66,7 @@ class TagRecyclerAdapter extends RecyclerView.Adapter<TagPickerViewHolder> {
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) {

6
app/src/main/java/org/tasks/tasklist/ViewHolder.java
Unescape Escape View File

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

3
app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java
Unescape Escape View File

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

3
app/src/main/java/org/tasks/themes/ColorProvider.kt
Unescape Escape View File

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

3
app/src/main/java/org/tasks/themes/DrawableUtil.java
Unescape Escape View File

@ -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) {

9
app/src/main/java/org/tasks/themes/ThemeColor.java
Unescape Escape View File

@ -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) {

3
app/src/main/java/org/tasks/ui/CheckBoxProvider.kt
Unescape Escape View File

@ -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

3
app/src/main/java/org/tasks/ui/DeadlineControlSet.java
Unescape Escape View File

@ -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 {

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

@ -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<String> {
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<String> {
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) {

11
app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java
Unescape Escape View File

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

3
app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
Unescape Escape View File

@ -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) {

3
app/src/main/java/org/tasks/widget/TasksWidget.java
Unescape Escape View File

@ -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) {

3
app/src/main/java/org/tasks/widget/WidgetPreferences.java
Unescape Escape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save