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

Remove InjectingAppCompatActivity

Browse Source
pull/2536/head
Alex Baker 8 months ago
parent 5a4485818f
commit ea8a4b5e2d
14 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
Unescape Escape View File

@ -11,6 +11,7 @@ import android.content.res.Configuration
import android.os.Bundle
import android.view.View
import android.view.inputmethod.InputMethodManager
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode
import androidx.lifecycle.lifecycleScope
import com.todoroo.andlib.utility.AndroidUtilities
@ -43,7 +44,6 @@ import org.tasks.databinding.TaskListActivityBinding
import org.tasks.dialogs.SortSettingsActivity
import org.tasks.dialogs.WhatsNewDialog
import org.tasks.filters.PlaceFilter
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.intents.TaskIntents.getTaskListIntent
import org.tasks.location.LocationPickerActivity
import org.tasks.play.PlayServices
@ -63,7 +63,7 @@ import timber.log.Timber
import javax.inject.Inject
@AndroidEntryPoint
class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandler, TimerControlSetCallback {
class MainActivity : AppCompatActivity(), TaskListFragmentCallbackHandler, TimerControlSetCallback {
@Inject lateinit var preferences: Preferences
@Inject lateinit var defaultFilterProvider: DefaultFilterProvider
@Inject lateinit var theme: Theme

4
app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.kt
Unescape Escape View File

@ -4,6 +4,7 @@ import android.content.ContentResolver
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.todoroo.astrid.data.Task
import com.todoroo.astrid.service.TaskCreator
@ -13,7 +14,6 @@ import kotlinx.coroutines.launch
import org.tasks.analytics.Firebase
import org.tasks.data.TaskAttachment
import org.tasks.files.FileHelper
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.intents.TaskIntents
import org.tasks.preferences.Preferences
import timber.log.Timber
@ -25,7 +25,7 @@ import javax.inject.Inject
* Create a new task based on incoming links from the "share" menu
*/
@AndroidEntryPoint
class ShareLinkActivity : InjectingAppCompatActivity() {
class ShareLinkActivity : AppCompatActivity() {
@Inject lateinit var taskCreator: TaskCreator
@Inject lateinit var preferences: Preferences
@Inject lateinit var firebase: Firebase

4
app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.kt
Unescape Escape View File

@ -10,6 +10,7 @@ import android.app.Activity
import android.app.ProgressDialog
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.todoroo.andlib.utility.DialogUtilities
import dagger.hilt.android.AndroidEntryPoint
@ -26,7 +27,6 @@ import org.tasks.data.CaldavDao
import org.tasks.data.GoogleTaskListDao
import org.tasks.dialogs.DialogBuilder
import org.tasks.gtasks.GoogleAccountManager
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.preferences.ActivityPermissionRequestor
import org.tasks.preferences.PermissionRequestor
import javax.inject.Inject
@ -38,7 +38,7 @@ import javax.inject.Inject
* @author Sam Bosley
*/
@AndroidEntryPoint
class GtasksLoginActivity : InjectingAppCompatActivity() {
class GtasksLoginActivity : AppCompatActivity() {
@Inject lateinit var dialogBuilder: DialogBuilder
@Inject lateinit var googleAccountManager: GoogleAccountManager
@Inject lateinit var caldavDao: CaldavDao

18
app/src/main/java/org/tasks/activities/CameraActivity.java
Unescape Escape View File

@ -6,19 +6,25 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.FileProvider;
import com.todoroo.astrid.utility.Constants;
import dagger.hilt.android.AndroidEntryPoint;
import java.io.File;
import java.io.IOException;
import javax.inject.Inject;
import org.tasks.files.FileHelper;
import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime;
import java.io.File;
import java.io.IOException;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
@AndroidEntryPoint
public class CameraActivity extends InjectingAppCompatActivity {
public class CameraActivity extends AppCompatActivity {
private static final int REQUEST_CODE_CAMERA = 75;
private static final String EXTRA_URI = "extra_output";

4
app/src/main/java/org/tasks/activities/DateAndTimePickerActivity.kt
Unescape Escape View File

@ -2,6 +2,7 @@ package org.tasks.activities
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.datepicker.MaterialDatePicker
import com.google.android.material.timepicker.MaterialTimePicker
import dagger.hilt.android.AndroidEntryPoint
@ -10,7 +11,6 @@ import org.tasks.dialogs.MyDatePickerDialog.Companion.newDatePicker
import org.tasks.dialogs.MyTimePickerDialog
import org.tasks.dialogs.MyTimePickerDialog.Companion.newTimePicker
import org.tasks.dialogs.MyTimePickerDialog.Companion.timeInputMode
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.preferences.Preferences
import org.tasks.themes.ThemeAccent
import org.tasks.time.DateTime
@ -18,7 +18,7 @@ import org.tasks.time.DateTimeUtils.currentTimeMillis
import javax.inject.Inject
@AndroidEntryPoint
class DateAndTimePickerActivity : InjectingAppCompatActivity() {
class DateAndTimePickerActivity : AppCompatActivity() {
@Inject lateinit var themeAccent: ThemeAccent
@Inject lateinit var preferences: Preferences

6
app/src/main/java/org/tasks/billing/PurchaseActivity.kt
Unescape Escape View File

@ -5,6 +5,7 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.window.Dialog
import androidx.lifecycle.lifecycleScope
@ -16,14 +17,13 @@ import org.tasks.R
import org.tasks.analytics.Firebase
import org.tasks.compose.PurchaseText.PurchaseText
import org.tasks.extensions.Context.toast
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.preferences.Preferences
import org.tasks.themes.Theme
import java.util.*
import java.util.Locale
import javax.inject.Inject
@AndroidEntryPoint
class PurchaseActivity : InjectingAppCompatActivity(), OnPurchasesUpdated {
class PurchaseActivity : AppCompatActivity(), OnPurchasesUpdated {
@Inject lateinit var theme: Theme
@Inject lateinit var billingClient: BillingClient
@Inject lateinit var localBroadcastManager: LocalBroadcastManager

4
app/src/main/java/org/tasks/drive/DriveLoginActivity.kt
Unescape Escape View File

@ -9,6 +9,7 @@ import android.accounts.AccountManager
import android.app.ProgressDialog
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.todoroo.andlib.utility.DialogUtilities
import dagger.hilt.android.AndroidEntryPoint
@ -16,7 +17,6 @@ import kotlinx.coroutines.launch
import org.tasks.R
import org.tasks.dialogs.DialogBuilder
import org.tasks.gtasks.GoogleAccountManager
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.preferences.Preferences
import javax.inject.Inject
@ -27,7 +27,7 @@ import javax.inject.Inject
* @author Sam Bosley
*/
@AndroidEntryPoint
class DriveLoginActivity : InjectingAppCompatActivity() {
class DriveLoginActivity : AppCompatActivity() {
@Inject lateinit var dialogBuilder: DialogBuilder
@Inject lateinit var googleAccountManager: GoogleAccountManager
@Inject lateinit var preferences: Preferences

11
app/src/main/java/org/tasks/injection/InjectingAppCompatActivity.kt
Unescape Escape View File

@ -1,11 +0,0 @@
package org.tasks.injection
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
abstract class InjectingAppCompatActivity protected constructor() : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
title = ""
}
}

4
app/src/main/java/org/tasks/location/LocationPickerActivity.kt
Unescape Escape View File

@ -8,6 +8,7 @@ import android.os.Parcelable
import android.view.MenuItem
import android.view.View
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar
import androidx.coordinatorlayout.widget.CoordinatorLayout
@ -39,7 +40,6 @@ import org.tasks.databinding.ActivityLocationPickerBinding
import org.tasks.dialogs.DialogBuilder
import org.tasks.extensions.Context.toast
import org.tasks.extensions.setOnQueryTextListener
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.location.LocationPickerAdapter.OnLocationPicked
import org.tasks.location.LocationSearchAdapter.OnPredictionPicked
import org.tasks.location.MapFragment.MapFragmentCallback
@ -54,7 +54,7 @@ import javax.inject.Inject
import kotlin.math.abs
@AndroidEntryPoint
class LocationPickerActivity : InjectingAppCompatActivity(), Toolbar.OnMenuItemClickListener, MapFragmentCallback, OnLocationPicked, SearchView.OnQueryTextListener, OnPredictionPicked, MenuItem.OnActionExpandListener {
class LocationPickerActivity : AppCompatActivity(), Toolbar.OnMenuItemClickListener, MapFragmentCallback, OnLocationPicked, SearchView.OnQueryTextListener, OnPredictionPicked, MenuItem.OnActionExpandListener {
private lateinit var toolbar: Toolbar
private lateinit var appBarLayout: AppBarLayout
private lateinit var toolbarLayout: CollapsingToolbarLayout

4
app/src/main/java/org/tasks/reminders/NotificationActivity.kt
Unescape Escape View File

@ -3,11 +3,11 @@ package org.tasks.reminders
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import org.tasks.data.TaskDao
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.intents.TaskIntents
import org.tasks.notifications.NotificationManager
import org.tasks.receivers.CompleteTaskReceiver
@ -16,7 +16,7 @@ import timber.log.Timber
import javax.inject.Inject
@AndroidEntryPoint
class NotificationActivity : InjectingAppCompatActivity(), NotificationDialog.NotificationHandler {
class NotificationActivity : AppCompatActivity(), NotificationDialog.NotificationHandler {
@Inject lateinit var notificationManager: NotificationManager
@Inject lateinit var taskDao: TaskDao
@Inject lateinit var themeAccent: ThemeAccent

4
app/src/main/java/org/tasks/reminders/SnoozeActivity.kt
Unescape Escape View File

@ -5,6 +5,7 @@ import android.content.Context
import android.content.DialogInterface
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.todoroo.astrid.alarms.AlarmService
import com.todoroo.astrid.dao.TaskDao
@ -13,13 +14,12 @@ import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.launch
import org.tasks.activities.DateAndTimePickerActivity
import org.tasks.dialogs.MyTimePickerDialog
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.themes.ThemeAccent
import org.tasks.time.DateTime
import javax.inject.Inject
@AndroidEntryPoint
class SnoozeActivity : InjectingAppCompatActivity(), SnoozeCallback, DialogInterface.OnCancelListener {
class SnoozeActivity : AppCompatActivity(), SnoozeCallback, DialogInterface.OnCancelListener {
@Inject lateinit var taskDao: TaskDao
@Inject lateinit var alarmService: AlarmService
@Inject lateinit var themeAccent: ThemeAccent

4
app/src/main/java/org/tasks/voice/VoiceCommandActivity.kt
Unescape Escape View File

@ -3,6 +3,7 @@ package org.tasks.voice
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.todoroo.astrid.service.TaskCreator
import dagger.hilt.android.AndroidEntryPoint
@ -11,11 +12,10 @@ import kotlinx.coroutines.launch
import org.tasks.R
import org.tasks.analytics.Firebase
import org.tasks.extensions.Context.toast
import org.tasks.injection.InjectingAppCompatActivity
import javax.inject.Inject
@AndroidEntryPoint
class VoiceCommandActivity : InjectingAppCompatActivity() {
class VoiceCommandActivity : AppCompatActivity() {
@Inject lateinit var taskCreator: TaskCreator
@Inject @ApplicationContext lateinit var context: Context
@Inject lateinit var firebase: Firebase

4
app/src/main/java/org/tasks/widget/WidgetClickActivity.kt
Unescape Escape View File

@ -1,6 +1,7 @@
package org.tasks.widget
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.data.Task
@ -12,13 +13,12 @@ import org.tasks.LocalBroadcastManager
import org.tasks.R
import org.tasks.dialogs.BaseDateTimePicker.OnDismissHandler
import org.tasks.dialogs.DateTimePicker.Companion.newDateTimePicker
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.intents.TaskIntents
import org.tasks.preferences.Preferences
import javax.inject.Inject
@AndroidEntryPoint
class WidgetClickActivity : InjectingAppCompatActivity(), OnDismissHandler {
class WidgetClickActivity : AppCompatActivity(), OnDismissHandler {
@Inject lateinit var taskCompleter: TaskCompleter
@Inject lateinit var taskDao: TaskDao
@Inject lateinit var localBroadcastManager: LocalBroadcastManager

4
app/src/main/java/org/tasks/widget/WidgetFilterSelectionActivity.kt
Unescape Escape View File

@ -3,20 +3,20 @@ package org.tasks.widget
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.todoroo.astrid.api.Filter
import dagger.hilt.android.AndroidEntryPoint
import org.tasks.LocalBroadcastManager
import org.tasks.dialogs.FilterPicker.Companion.EXTRA_FILTER
import org.tasks.dialogs.FilterPicker.Companion.SELECT_FILTER
import org.tasks.dialogs.FilterPicker.Companion.newFilterPicker
import org.tasks.injection.InjectingAppCompatActivity
import org.tasks.preferences.DefaultFilterProvider
import org.tasks.preferences.Preferences
import timber.log.Timber
import javax.inject.Inject
@AndroidEntryPoint
class WidgetFilterSelectionActivity : InjectingAppCompatActivity() {
class WidgetFilterSelectionActivity : AppCompatActivity() {
@Inject lateinit var preferences: Preferences
@Inject lateinit var defaultFilterProvider: DefaultFilterProvider
@Inject lateinit var localBroadcastManager: LocalBroadcastManager

Write Preview
Loading…
Cancel
Save