From ccf150310ff41a6fc680b661fe5bd0fe175b8527 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 27 Jul 2020 17:36:42 -0500 Subject: [PATCH] Convert NotificationActivity to Kotlin --- .../tasks/reminders/NotificationActivity.java | 110 ------------------ .../tasks/reminders/NotificationActivity.kt | 96 +++++++++++++++ 2 files changed, 96 insertions(+), 110 deletions(-) delete mode 100644 app/src/main/java/org/tasks/reminders/NotificationActivity.java create mode 100644 app/src/main/java/org/tasks/reminders/NotificationActivity.kt diff --git a/app/src/main/java/org/tasks/reminders/NotificationActivity.java b/app/src/main/java/org/tasks/reminders/NotificationActivity.java deleted file mode 100644 index c05573361..000000000 --- a/app/src/main/java/org/tasks/reminders/NotificationActivity.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.tasks.reminders; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import androidx.fragment.app.FragmentManager; -import com.todoroo.astrid.dao.TaskDaoBlocking; -import dagger.hilt.android.AndroidEntryPoint; -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.schedulers.Schedulers; -import javax.inject.Inject; -import org.tasks.injection.InjectingAppCompatActivity; -import org.tasks.intents.TaskIntents; -import org.tasks.notifications.NotificationManager; -import org.tasks.receivers.CompleteTaskReceiver; -import org.tasks.themes.ThemeAccent; -import timber.log.Timber; - -@AndroidEntryPoint -public class NotificationActivity extends InjectingAppCompatActivity - implements NotificationDialog.NotificationHandler { - - public static final String EXTRA_TITLE = "extra_title"; - public static final String EXTRA_TASK_ID = "extra_task_id"; - private static final String FRAG_TAG_NOTIFICATION_FRAGMENT = "frag_tag_notification_fragment"; - @Inject NotificationManager notificationManager; - @Inject TaskDaoBlocking taskDao; - @Inject ThemeAccent themeAccent; - - public static Intent newIntent(Context context, String title, long id) { - Intent intent = new Intent(context, NotificationActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - intent.putExtra(NotificationActivity.EXTRA_TASK_ID, id); - intent.putExtra(NotificationActivity.EXTRA_TITLE, title); - return intent; - } - - private long taskId; - private CompositeDisposable disposables; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - themeAccent.applyStyle(getTheme()); - - Intent intent = getIntent(); - - taskId = intent.getLongExtra(EXTRA_TASK_ID, 0L); - - FragmentManager fragmentManager = getSupportFragmentManager(); - NotificationDialog fragment = - (NotificationDialog) fragmentManager.findFragmentByTag(FRAG_TAG_NOTIFICATION_FRAGMENT); - if (fragment == null) { - fragment = new NotificationDialog(); - fragment.show(fragmentManager, FRAG_TAG_NOTIFICATION_FRAGMENT); - } - fragment.setTitle(intent.getStringExtra(EXTRA_TITLE)); - } - - @Override - public void dismiss() { - finish(); - } - - @Override - protected void onResume() { - super.onResume(); - - disposables = new CompositeDisposable(); - } - - @Override - protected void onPause() { - super.onPause(); - - disposables.dispose(); - } - - @Override - public void edit() { - notificationManager.cancel(taskId); - disposables.add( - Single.fromCallable(() -> taskDao.fetchBlocking(taskId)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - task -> { - startActivity(TaskIntents.getEditTaskIntent(this, null, task)); - finish(); - }, - e -> Timber.e("Task not found: %s", taskId))); - } - - @Override - public void snooze() { - finish(); - startActivity(SnoozeActivity.newIntent(this, taskId)); - } - - @Override - public void complete() { - Intent intent = new Intent(this, CompleteTaskReceiver.class); - intent.putExtra(CompleteTaskReceiver.TASK_ID, taskId); - sendBroadcast(intent); - finish(); - } -} diff --git a/app/src/main/java/org/tasks/reminders/NotificationActivity.kt b/app/src/main/java/org/tasks/reminders/NotificationActivity.kt new file mode 100644 index 000000000..64e23ad11 --- /dev/null +++ b/app/src/main/java/org/tasks/reminders/NotificationActivity.kt @@ -0,0 +1,96 @@ +package org.tasks.reminders + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import com.todoroo.astrid.dao.TaskDaoBlocking +import com.todoroo.astrid.data.Task +import dagger.hilt.android.AndroidEntryPoint +import io.reactivex.Single +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.schedulers.Schedulers +import org.tasks.injection.InjectingAppCompatActivity +import org.tasks.intents.TaskIntents +import org.tasks.notifications.NotificationManager +import org.tasks.receivers.CompleteTaskReceiver +import org.tasks.themes.ThemeAccent +import timber.log.Timber +import javax.inject.Inject + +@AndroidEntryPoint +class NotificationActivity : InjectingAppCompatActivity(), NotificationDialog.NotificationHandler { + @Inject lateinit var notificationManager: NotificationManager + @Inject lateinit var taskDao: TaskDaoBlocking + @Inject lateinit var themeAccent: ThemeAccent + + private var taskId: Long = 0 + private var disposables: CompositeDisposable? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + themeAccent.applyStyle(theme) + val intent = intent + taskId = intent.getLongExtra(EXTRA_TASK_ID, 0L) + val fragmentManager = supportFragmentManager + var fragment = fragmentManager.findFragmentByTag(FRAG_TAG_NOTIFICATION_FRAGMENT) as NotificationDialog? + if (fragment == null) { + fragment = NotificationDialog() + fragment.show(fragmentManager, FRAG_TAG_NOTIFICATION_FRAGMENT) + } + fragment.setTitle(intent.getStringExtra(EXTRA_TITLE)) + } + + override fun dismiss() { + finish() + } + + override fun onResume() { + super.onResume() + disposables = CompositeDisposable() + } + + override fun onPause() { + super.onPause() + disposables!!.dispose() + } + + override fun edit() { + notificationManager.cancel(taskId) + disposables!!.add( + Single.fromCallable { taskDao.fetchBlocking(taskId) } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + { task: Task? -> + startActivity(TaskIntents.getEditTaskIntent(this, null, task)) + finish() + } + ) { Timber.e("Task not found: $taskId") }) + } + + override fun snooze() { + finish() + startActivity(SnoozeActivity.newIntent(this, taskId)) + } + + override fun complete() { + val intent = Intent(this, CompleteTaskReceiver::class.java) + intent.putExtra(CompleteTaskReceiver.TASK_ID, taskId) + sendBroadcast(intent) + finish() + } + + companion object { + const val EXTRA_TITLE = "extra_title" + const val EXTRA_TASK_ID = "extra_task_id" + private const val FRAG_TAG_NOTIFICATION_FRAGMENT = "frag_tag_notification_fragment" + fun newIntent(context: Context?, title: String?, id: Long): Intent { + val intent = Intent(context, NotificationActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + intent.putExtra(EXTRA_TASK_ID, id) + intent.putExtra(EXTRA_TITLE, title) + return intent + } + } +} \ No newline at end of file