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 504e961bf..6cfe5e098 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -16,6 +16,7 @@ import static org.tasks.files.FileHelper.copyToUri; import android.app.Activity; import android.content.Context; +import android.content.Intent; import android.graphics.Paint; import android.graphics.drawable.ColorDrawable; import android.net.Uri; @@ -331,6 +332,15 @@ public final class TaskEditFragment extends InjectingFragment if (isNewTask) { taskListFragment.onTaskCreated(model.getUuid()); + if (!Strings.isNullOrEmpty(model.getCalendarURI())) { + taskListFragment.makeSnackbar(R.string.calendar_event_created, model.getTitle()) + .setAction(R.string.action_open, v -> { + String uri = model.getCalendarURI(); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri)); + taskListFragment.startActivity(intent); + }) + .show(); + } } }) .subscribeOn(Schedulers.io()) 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 598796f48..93ff6ce93 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -30,6 +30,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.view.ActionMode; import androidx.appcompat.view.ActionMode.Callback; @@ -525,6 +526,10 @@ public final class TaskListFragment extends InjectingFragment refresh(); } + public Snackbar makeSnackbar(@StringRes int res, Object... args) { + return makeSnackbar(getString(res, args)); + } + public Snackbar makeSnackbar(String text) { Snackbar snackbar = Snackbar.make(coordinatorLayout, text, 8000) @@ -831,9 +836,7 @@ public final class TaskListFragment extends InjectingFragment for (Task task : result) { onTaskDelete(task); } - makeSnackbar( - context.getString( - R.string.delete_multiple_tasks_confirmation, Integer.toString(result.size()))) + makeSnackbar(R.string.delete_multiple_tasks_confirmation, Integer.toString(result.size())) .show(); } @@ -841,9 +844,7 @@ public final class TaskListFragment extends InjectingFragment finishActionMode(); List duplicates = taskDuplicator.duplicate(tasks); onTaskCreated(duplicates); - makeSnackbar( - context.getString( - R.string.copy_multiple_tasks_confirmation, Integer.toString(duplicates.size()))) + makeSnackbar(R.string.copy_multiple_tasks_confirmation, Integer.toString(duplicates.size())) .show(); } } diff --git a/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java b/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java index b72080d5f..44d8372aa 100644 --- a/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java +++ b/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java @@ -68,10 +68,8 @@ public class RepeatConfirmationReceiver extends BroadcastReceiver { String dueDateString = DateUtilities.getRelativeDateTime( activity, newDueDate, locale.getLocale(), FormatStyle.LONG); - String snackbarText = - activity.getString(R.string.repeat_snackbar, task.getTitle(), dueDateString); taskListFragment - .makeSnackbar(snackbarText) + .makeSnackbar(R.string.repeat_snackbar, task.getTitle(), dueDateString) .setAction( R.string.DLG_undo, v -> { diff --git a/app/src/main/java/org/tasks/ui/CalendarControlSet.java b/app/src/main/java/org/tasks/ui/CalendarControlSet.java index 2d88dea7b..9f3d4cb15 100644 --- a/app/src/main/java/org/tasks/ui/CalendarControlSet.java +++ b/app/src/main/java/org/tasks/ui/CalendarControlSet.java @@ -177,15 +177,6 @@ public class CalendarControlSet extends TaskEditControlFragment { Uri uri = gcalHelper.createTaskEvent(task, values); if (uri != null) { task.setCalendarUri(uri.toString()); - // pop up the new event - Intent intent = new Intent(Intent.ACTION_VIEW, uri); - intent.putExtra( - CalendarContract.EXTRA_EVENT_BEGIN_TIME, - values.getAsLong(CalendarContract.Events.DTSTART)); - intent.putExtra( - CalendarContract.EXTRA_EVENT_END_TIME, - values.getAsLong(CalendarContract.Events.DTEND)); - startActivity(intent); } } catch (Exception e) { Timber.e(e); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd04bf0e4..1568175d5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -580,4 +580,5 @@ File %1$s contained %2$s.\n\n Pick date Autoclose date time picker Close date time picker after selecting a date or time + Calendar event created for %s