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 6cfe5e098..fbf982f99 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -66,7 +66,6 @@ import org.tasks.injection.InjectingFragment; import org.tasks.notifications.NotificationManager; import org.tasks.preferences.Preferences; import org.tasks.themes.ThemeColor; -import org.tasks.ui.AnimationUtil; import org.tasks.ui.SubtaskControlSet; import org.tasks.ui.TaskEditControlFragment; @@ -177,9 +176,10 @@ public final class TaskEditFragment extends InjectingFragment title.setTextColor(themeColor.getColorOnPrimary()); title.setHintTextColor(themeColor.getHintOnPrimary()); title.setMaxLines(5); - if (completed) { + if (model.isNew()) { + binding.fab.setVisibility(View.INVISIBLE); + } else if (completed) { title.setPaintFlags(title.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - binding.fab.setImageResource(R.drawable.ic_undo_24px); } binding.fab.setOnClickListener(v -> { @@ -206,14 +206,9 @@ public final class TaskEditFragment extends InjectingFragment binding.collapsingtoolbarlayout.setTitle(title.getText()); binding.collapsingtoolbarlayout.setTitleEnabled(true); } - if (title.getText().length() > 0) { - AnimationUtil.circularReveal(binding.fab); - } }); - if (model.isNew() && title.getText().length() == 0) { - binding.fab.setVisibility(View.INVISIBLE); - } else { + if (!model.isNew()) { notificationManager.cancel(model.getId()); if (preferences.getBoolean(R.string.p_linkify_task_edit, false)) { diff --git a/app/src/main/java/org/tasks/ui/AnimationUtil.java b/app/src/main/java/org/tasks/ui/AnimationUtil.java deleted file mode 100644 index 683f7c625..000000000 --- a/app/src/main/java/org/tasks/ui/AnimationUtil.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.tasks.ui; - -import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop; - -import android.animation.Animator; -import android.annotation.SuppressLint; -import android.view.View; -import android.view.ViewAnimationUtils; - -public class AnimationUtil { - - @SuppressLint("NewApi") - public static void circularReveal(View v) { - if (v.getVisibility() == View.VISIBLE) { - return; - } - if (preLollipop()) { - v.setVisibility(View.VISIBLE); - } else { - int cx = v.getMeasuredWidth() / 2; - int cy = v.getMeasuredHeight() / 2; - int finalRadius = Math.max(v.getWidth(), v.getHeight()) / 2; - - Animator anim = ViewAnimationUtils.createCircularReveal(v, cx, cy, 0, finalRadius); - v.setVisibility(View.VISIBLE); - anim.start(); - } - } -}