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

Fix ViewModelProviders deprecation

Browse Source
pull/996/head
Alex Baker 4 years ago
parent 688baad5a6
commit 56f5fef901
14 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -29,7 +29,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.view.ActionMode; import androidx.appcompat.view.ActionMode;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
@ -111,7 +111,7 @@ public class MainActivity extends InjectingAppCompatActivity
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
TaskListViewModel viewModel = ViewModelProviders.of(this).get(TaskListViewModel.class); TaskListViewModel viewModel = new ViewModelProvider(this).get(TaskListViewModel.class);
getComponent().inject(viewModel); getComponent().inject(viewModel);
currentNightMode = getNightMode(); currentNightMode = getNightMode();

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

@ -42,7 +42,7 @@ import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.util.Pair; import androidx.core.util.Pair;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -282,7 +282,7 @@ public final class TaskListFragment extends InjectingFragment
// set up list adapters // set up list adapters
taskAdapter = taskAdapterProvider.createTaskAdapter(filter); taskAdapter = taskAdapterProvider.createTaskAdapter(filter);
taskListViewModel = ViewModelProviders.of(getActivity()).get(TaskListViewModel.class); taskListViewModel = new ViewModelProvider(getActivity()).get(TaskListViewModel.class);
if (savedInstanceState != null) { if (savedInstanceState != null) {
searchQuery = savedInstanceState.getString(EXTRA_SEARCH); searchQuery = savedInstanceState.getString(EXTRA_SEARCH);

9
app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
Unescape Escape View File

@ -9,7 +9,7 @@ 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 android.widget.Toast;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import butterknife.BindView; import butterknife.BindView;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
@ -57,9 +57,10 @@ public class GoogleTaskListSettingsActivity extends BaseListSettingsActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
createListViewModel = ViewModelProviders.of(this).get(CreateListViewModel.class); ViewModelProvider provider = new ViewModelProvider(this);
renameListViewModel = ViewModelProviders.of(this).get(RenameListViewModel.class); createListViewModel = provider.get(CreateListViewModel.class);
deleteListViewModel = ViewModelProviders.of(this).get(DeleteListViewModel.class); renameListViewModel = provider.get(RenameListViewModel.class);
deleteListViewModel = provider.get(DeleteListViewModel.class);
if (gtasksList == null) { if (gtasksList == null) {
isNewList = true; isNewList = true;

8
app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
Unescape Escape View File

@ -3,7 +3,7 @@ package org.tasks.caldav;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.todoroo.astrid.helper.UUIDHelper; import com.todoroo.astrid.helper.UUIDHelper;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
@ -27,9 +27,9 @@ public class CaldavAccountSettingsActivity extends BaseCaldavAccountSettingsActi
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addCaldavAccountViewModel = ViewModelProviders.of(this).get(AddCaldavAccountViewModel.class); ViewModelProvider provider = new ViewModelProvider(this);
updateCaldavAccountViewModel = addCaldavAccountViewModel = provider.get(AddCaldavAccountViewModel.class);
ViewModelProviders.of(this).get(UpdateCaldavAccountViewModel.class); updateCaldavAccountViewModel = provider.get(UpdateCaldavAccountViewModel.class);
addCaldavAccountViewModel.observe(this, this::addAccount, this::requestFailed); addCaldavAccountViewModel.observe(this, this::addAccount, this::requestFailed);
updateCaldavAccountViewModel.observe(this, this::updateAccount, this::requestFailed); updateCaldavAccountViewModel.observe(this, this::updateAccount, this::requestFailed);

9
app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
Unescape Escape View File

@ -1,7 +1,7 @@
package org.tasks.caldav; package org.tasks.caldav;
import android.os.Bundle; import android.os.Bundle;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
import org.tasks.data.CaldavAccount; import org.tasks.data.CaldavAccount;
@ -25,9 +25,10 @@ public class CaldavCalendarSettingsActivity extends BaseCaldavCalendarSettingsAc
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
createCalendarViewModel = ViewModelProviders.of(this).get(CreateCalendarViewModel.class); ViewModelProvider provider = new ViewModelProvider(this);
deleteCalendarViewModel = ViewModelProviders.of(this).get(DeleteCalendarViewModel.class); createCalendarViewModel = provider.get(CreateCalendarViewModel.class);
updateCalendarViewModel = ViewModelProviders.of(this).get(UpdateCalendarViewModel.class); deleteCalendarViewModel = provider.get(DeleteCalendarViewModel.class);
updateCalendarViewModel = provider.get(UpdateCalendarViewModel.class);
createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed); createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed);
deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed); deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed);

4
app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java
Unescape Escape View File

@ -13,7 +13,7 @@ import android.view.View;
import android.widget.Chronometer; import android.widget.Chronometer;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
@ -57,7 +57,7 @@ public class RecordAudioDialog extends InjectingDialogFragment
View view = layoutInflater.inflate(R.layout.aac_record_activity, null); View view = layoutInflater.inflate(R.layout.aac_record_activity, null);
ButterKnife.bind(this, view); ButterKnife.bind(this, view);
recorder = ViewModelProviders.of(this).get(AACRecorder.class); recorder = new ViewModelProvider(this).get(AACRecorder.class);
recorder.init(this, preferences); recorder.init(this, preferences);
if (permissionChecker.canAccessMic()) { if (permissionChecker.canAccessMic()) {

4
app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java
Unescape Escape View File

@ -10,7 +10,7 @@ import android.view.View;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import at.bitfire.dav4jvm.exception.HttpException; import at.bitfire.dav4jvm.exception.HttpException;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnTextChanged; import butterknife.OnTextChanged;
@ -51,7 +51,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
createUserInfoViewModel = ViewModelProviders.of(this).get(CreateUserInfoViewModel.class); createUserInfoViewModel = new ViewModelProvider(this).get(CreateUserInfoViewModel.class);
binding = ActivityEtesyncEncryptionSettingsBinding.inflate(getLayoutInflater()); binding = ActivityEtesyncEncryptionSettingsBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot()); setContentView(binding.getRoot());

7
app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java
Unescape Escape View File

@ -9,7 +9,7 @@ import android.view.View;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.util.Pair; import androidx.core.util.Pair;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import butterknife.OnCheckedChanged; import butterknife.OnCheckedChanged;
import com.etesync.journalmanager.Crypto.CryptoManager; import com.etesync.journalmanager.Crypto.CryptoManager;
import com.etesync.journalmanager.Exceptions.IntegrityException; import com.etesync.journalmanager.Exceptions.IntegrityException;
@ -48,8 +48,9 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
binding.showAdvanced.setVisibility(View.VISIBLE); binding.showAdvanced.setVisibility(View.VISIBLE);
updateUrlVisibility(); updateUrlVisibility();
addAccountViewModel = ViewModelProviders.of(this).get(AddEteSyncAccountViewModel.class); ViewModelProvider provider = new ViewModelProvider(this);
updateAccountViewModel = ViewModelProviders.of(this).get(UpdateEteSyncAccountViewModel.class); addAccountViewModel = provider.get(AddEteSyncAccountViewModel.class);
updateAccountViewModel = provider.get(UpdateEteSyncAccountViewModel.class);
} }
@Override @Override

9
app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.java
Unescape Escape View File

@ -1,7 +1,7 @@
package org.tasks.etesync; package org.tasks.etesync;
import android.os.Bundle; import android.os.Bundle;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.caldav.BaseCaldavCalendarSettingsActivity; import org.tasks.caldav.BaseCaldavCalendarSettingsActivity;
import org.tasks.data.CaldavAccount; import org.tasks.data.CaldavAccount;
@ -19,9 +19,10 @@ public class EteSyncCalendarSettingsActivity extends BaseCaldavCalendarSettingsA
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
createCalendarViewModel = ViewModelProviders.of(this).get(CreateCalendarViewModel.class); ViewModelProvider provider = new ViewModelProvider(this);
deleteCalendarViewModel = ViewModelProviders.of(this).get(DeleteCalendarViewModel.class); createCalendarViewModel = provider.get(CreateCalendarViewModel.class);
updateCalendarViewModel = ViewModelProviders.of(this).get(UpdateCalendarViewModel.class); deleteCalendarViewModel = provider.get(DeleteCalendarViewModel.class);
updateCalendarViewModel = provider.get(UpdateCalendarViewModel.class);
createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed); createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed);
deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed); deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed);

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

@ -24,7 +24,7 @@ import androidx.appcompat.widget.Toolbar;
import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.widget.ContentLoadingProgressBar; import androidx.core.widget.ContentLoadingProgressBar;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
@ -134,7 +134,7 @@ public class LocationPickerActivity extends InjectingAppCompatActivity
setContentView(R.layout.activity_location_picker); setContentView(R.layout.activity_location_picker);
ButterKnife.bind(this); ButterKnife.bind(this);
viewModel = ViewModelProviders.of(this).get(PlaceSearchViewModel.class); viewModel = new ViewModelProvider(this).get(PlaceSearchViewModel.class);
viewModel.setSearchProvider(searchProvider); viewModel.setSearchProvider(searchProvider);
Configuration configuration = getResources().getConfiguration(); Configuration configuration = getResources().getConfiguration();

4
app/src/main/java/org/tasks/preferences/AttributionActivity.java
Unescape Escape View File

@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
@ -59,7 +59,7 @@ public class AttributionActivity extends ThemedInjectingAppCompatActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
ViewModelProviders.of(this).get(ViewModel.class).observe(this, this::updateAttributions); new ViewModelProvider(this).get(ViewModel.class).observe(this, this::updateAttributions);
} }
private void updateAttributions(List<LibraryAttribution> libraryAttributions) { private void updateAttributions(List<LibraryAttribution> libraryAttributions) {

4
app/src/main/java/org/tasks/tags/TagPickerActivity.java
Unescape Escape View File

@ -4,7 +4,7 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.widget.EditText; import android.widget.EditText;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
@ -117,7 +117,7 @@ public class TagPickerActivity extends ThemedInjectingAppCompatActivity {
@Override @Override
public void inject(ActivityComponent component) { public void inject(ActivityComponent component) {
component.inject(this); component.inject(this);
viewModel = ViewModelProviders.of(this).get(TagPickerViewModel.class); viewModel = new ViewModelProvider(this).get(TagPickerViewModel.class);
component.inject(viewModel); component.inject(viewModel);
} }
} }

4
app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
Unescape Escape View File

@ -21,7 +21,7 @@ import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener; import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.todoroo.astrid.adapter.NavigationDrawerAdapter; import com.todoroo.astrid.adapter.NavigationDrawerAdapter;
@ -125,7 +125,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
} }
}); });
if (item instanceof Filter) { if (item instanceof Filter) {
ViewModelProviders.of(getActivity()).get(TaskListViewModel.class).setFilter((Filter) item); new ViewModelProvider(this).get(TaskListViewModel.class).setFilter((Filter) item);
} }
close(); close();
} }

4
app/src/main/java/org/tasks/ui/SubtaskControlSet.java
Unescape Escape View File

@ -17,7 +17,7 @@ import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -84,7 +84,7 @@ public class SubtaskControlSet extends TaskEditControlFragment implements Callba
@Override @Override
protected void inject(FragmentComponent component) { protected void inject(FragmentComponent component) {
component.inject(this); component.inject(this);
viewModel = ViewModelProviders.of(this).get(TaskListViewModel.class); viewModel = new ViewModelProvider(this).get(TaskListViewModel.class);
component.inject(viewModel); component.inject(viewModel);
} }

Write Preview
Loading…
Cancel
Save