Use extension method for toasts

pull/1432/head
Alex Baker 5 years ago
parent 781ea9c03e
commit b1c6c9b7cc

@ -7,7 +7,6 @@ import android.os.Bundle
import android.view.View import android.view.View
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.Toast
import androidx.activity.viewModels import androidx.activity.viewModels
import butterknife.BindView import butterknife.BindView
import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputEditText
@ -17,12 +16,12 @@ import com.todoroo.astrid.activity.TaskListFragment
import com.todoroo.astrid.api.GtasksFilter import com.todoroo.astrid.api.GtasksFilter
import com.todoroo.astrid.service.TaskDeleter import com.todoroo.astrid.service.TaskDeleter
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.qualifiers.ApplicationContext
import org.tasks.R import org.tasks.R
import org.tasks.Strings.isNullOrEmpty import org.tasks.Strings.isNullOrEmpty
import org.tasks.data.GoogleTaskAccount import org.tasks.data.GoogleTaskAccount
import org.tasks.data.GoogleTaskList import org.tasks.data.GoogleTaskList
import org.tasks.data.GoogleTaskListDao import org.tasks.data.GoogleTaskListDao
import org.tasks.extensions.Context.toast
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@ -94,7 +93,7 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
} }
val newName = newName val newName = newName
if (isNullOrEmpty(newName)) { if (isNullOrEmpty(newName)) {
Toast.makeText(this, R.string.name_cannot_be_empty, Toast.LENGTH_LONG).show() toast(R.string.name_cannot_be_empty)
return return
} }
when { when {
@ -201,7 +200,7 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
private fun requestFailed(error: Throwable) { private fun requestFailed(error: Throwable) {
Timber.e(error) Timber.e(error)
hideProgressIndicator() hideProgressIndicator()
Toast.makeText(this, R.string.gtasks_GLA_errorIOAuth, Toast.LENGTH_LONG).show() toast(R.string.gtasks_GLA_errorIOAuth)
return return
} }

@ -6,7 +6,6 @@ import android.app.backup.BackupManager
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Handler import android.os.Handler
import android.widget.Toast
import com.google.common.io.Files import com.google.common.io.Files
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
@ -17,6 +16,7 @@ import org.tasks.R
import org.tasks.backup.BackupContainer.TaskBackup import org.tasks.backup.BackupContainer.TaskBackup
import org.tasks.data.* import org.tasks.data.*
import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.date.DateTimeUtils.newDateTime
import org.tasks.extensions.Context.toast
import org.tasks.files.FileHelper import org.tasks.files.FileHelper
import org.tasks.jobs.WorkManager import org.tasks.jobs.WorkManager
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
@ -144,13 +144,13 @@ class TasksJsonExporter @Inject constructor(
} }
private fun onFinishExport(outputFile: String) = post { private fun onFinishExport(outputFile: String) = post {
val text: CharSequence = String.format( context?.toast(
context!!.getString(R.string.export_toast), R.string.export_toast,
context!! context!!
.resources .resources
.getQuantityString(R.plurals.Ntasks, exportCount, exportCount), .getQuantityString(R.plurals.Ntasks, exportCount, exportCount),
outputFile) outputFile
Toast.makeText(context, text, Toast.LENGTH_LONG).show() )
} }

@ -3,12 +3,12 @@ package org.tasks.preferences.fragments
import android.app.Activity.RESULT_OK import android.app.Activity.RESULT_OK
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.widget.Toast
import androidx.preference.ListPreference import androidx.preference.ListPreference
import androidx.preference.Preference import androidx.preference.Preference
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R import org.tasks.R
import org.tasks.dialogs.MyTimePickerDialog.Companion.newTimePicker import org.tasks.dialogs.MyTimePickerDialog.Companion.newTimePicker
import org.tasks.extensions.Context.toast
import org.tasks.injection.InjectingPreferenceFragment import org.tasks.injection.InjectingPreferenceFragment
import org.tasks.locale.Locale import org.tasks.locale.Locale
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
@ -120,14 +120,8 @@ class DateAndTime : InjectingPreferenceFragment(), Preference.OnPreferenceChange
invalidSetting(R.string.date_shortcut_must_come_after, settingResId, relativeResId) invalidSetting(R.string.date_shortcut_must_come_after, settingResId, relativeResId)
} }
private fun invalidSetting(errorResId: Int, settingResId: Int, relativeResId: Int) { private fun invalidSetting(errorResId: Int, settingResId: Int, relativeResId: Int) =
Toast.makeText( context?.toast(errorResId, getString(settingResId), getString(relativeResId))
context,
getString(errorResId, getString(settingResId), getString(relativeResId)),
Toast.LENGTH_SHORT
)
.show()
}
private fun updateStartOfWeek(value: String) { private fun updateStartOfWeek(value: String) {
val preference = getStartOfWeekPreference() val preference = getStartOfWeekPreference()

@ -6,7 +6,7 @@ import android.net.Uri
import android.provider.CalendarContract import android.provider.CalendarContract
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast.LENGTH_SHORT
import butterknife.BindView import butterknife.BindView
import butterknife.OnClick import butterknife.OnClick
import com.todoroo.astrid.gcal.GCalHelper import com.todoroo.astrid.gcal.GCalHelper
@ -19,6 +19,7 @@ import org.tasks.calendars.CalendarEventProvider
import org.tasks.calendars.CalendarPicker import org.tasks.calendars.CalendarPicker
import org.tasks.calendars.CalendarProvider import org.tasks.calendars.CalendarProvider
import org.tasks.dialogs.DialogBuilder import org.tasks.dialogs.DialogBuilder
import org.tasks.extensions.Context.toast
import org.tasks.preferences.FragmentPermissionRequestor import org.tasks.preferences.FragmentPermissionRequestor
import org.tasks.preferences.PermissionChecker import org.tasks.preferences.PermissionChecker
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
@ -112,8 +113,7 @@ class CalendarControlSet : TaskEditControlFragment() {
null, null,
null).use { cursor -> null).use { cursor ->
if (cursor!!.count == 0) { if (cursor!!.count == 0) {
// event no longer exists activity.toast(R.string.calendar_event_not_found, duration = LENGTH_SHORT)
Toast.makeText(activity, R.string.calendar_event_not_found, Toast.LENGTH_SHORT).show()
viewModel.eventUri = null viewModel.eventUri = null
refreshDisplayView() refreshDisplayView()
} else { } else {
@ -125,7 +125,7 @@ class CalendarControlSet : TaskEditControlFragment() {
} }
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e) Timber.e(e)
Toast.makeText(activity, R.string.gcal_TEA_error, Toast.LENGTH_LONG).show() activity.toast(R.string.gcal_TEA_error)
} }
} }

Loading…
Cancel
Save