FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace ViewModelProviders.of() by ViewModelProvider()

Browse Source
This commit is contained in:
Shinokuni 2020-07-17 20:55:00 +02:00
parent b433d28177
commit c1edc939a0
11 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java
View File

@ -11,7 +11,7 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
@ -54,7 +54,7 @@ public class AccountTypeListActivity extends AppCompatActivity {
binding = ActivityAccountTypeListBinding.inflate(getLayoutInflater()); binding = ActivityAccountTypeListBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot()); setContentView(binding.getRoot());
viewModel = ViewModelProviders.of(this).get(AccountViewModel.class); viewModel = new ViewModelProvider(this).get(AccountViewModel.class);
setTitle(R.string.new_account); setTitle(R.string.new_account);

4
app/src/main/java/com/readrops/app/activities/AddAccountActivity.java
View File

@ -8,7 +8,7 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.databinding.ActivityAddAccountBinding; import com.readrops.app.databinding.ActivityAddAccountBinding;
@ -46,7 +46,7 @@ public class AddAccountActivity extends AppCompatActivity {
binding = ActivityAddAccountBinding.inflate(getLayoutInflater()); binding = ActivityAddAccountBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot()); setContentView(binding.getRoot());
viewModel = ViewModelProviders.of(this).get(AccountViewModel.class); viewModel = new ViewModelProvider(this).get(AccountViewModel.class);
accountType = getIntent().getParcelableExtra(ACCOUNT_TYPE); accountType = getIntent().getParcelableExtra(ACCOUNT_TYPE);

4
app/src/main/java/com/readrops/app/activities/AddFeedActivity.java
View File

@ -12,7 +12,7 @@ import android.view.View;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
@ -83,7 +83,7 @@ public class AddFeedActivity extends AppCompatActivity implements View.OnClickLi
return false; return false;
}); });
viewModel = ViewModelProviders.of(this).get(AddFeedsViewModel.class); viewModel = new ViewModelProvider(this).get(AddFeedsViewModel.class);
parseItemsAdapter = new ItemAdapter<>(); parseItemsAdapter = new ItemAdapter<>();
fastAdapter = FastAdapter.with(parseItemsAdapter); fastAdapter = FastAdapter.with(parseItemsAdapter);

14
app/src/main/java/com/readrops/app/activities/ItemActivity.java
View File

@ -29,7 +29,7 @@ import androidx.appcompat.widget.Toolbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.app.ShareCompat; import androidx.core.app.ShareCompat;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
@ -39,8 +39,6 @@ import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropsdb.pojo.ItemWithFeed;
import com.readrops.app.utils.DateUtils; import com.readrops.app.utils.DateUtils;
import com.readrops.app.utils.GlideApp; import com.readrops.app.utils.GlideApp;
import com.readrops.app.utils.PermissionManager; import com.readrops.app.utils.PermissionManager;
@ -48,6 +46,8 @@ import com.readrops.app.utils.ReadropsWebView;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ItemViewModel; import com.readrops.app.viewmodels.ItemViewModel;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropsdb.pojo.ItemWithFeed;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -146,7 +146,7 @@ public class ItemActivity extends AppCompatActivity {
} }
})); }));
viewModel = ViewModelProviders.of(this).get(ItemViewModel.class); viewModel = new ViewModelProvider(this).get(ItemViewModel.class);
viewModel.getItemById(itemId).observe(this, this::bindUI); viewModel.getItemById(itemId).observe(this, this::bindUI);
actionButton.setOnClickListener(v -> openInNavigator()); actionButton.setOnClickListener(v -> openInNavigator());
} }
@ -314,9 +314,9 @@ public class ItemActivity extends AppCompatActivity {
} }
} }
new MaterialDialog.Builder(this) new MaterialDialog.Builder(this)
.title(urlToDownload) .title(urlToDownload)
.content(imageTitle) .content(imageTitle)
.show(); .show();
break; break;
default: default:
throw new IllegalStateException("Unexpected value: " + position); throw new IllegalStateException("Unexpected value: " + position);

4
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -21,7 +21,7 @@ import androidx.appcompat.widget.Toolbar;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.paging.PagedList; import androidx.paging.PagedList;
import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper;
@ -138,7 +138,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
feedCount = 0; feedCount = 0;
initRecyclerView(); initRecyclerView();
viewModel = ViewModelProviders.of(this).get(MainViewModel.class); viewModel = new ViewModelProvider(this).get(MainViewModel.class);
viewModel.setShowReadItems(SharedPreferencesManager.readBoolean(this, viewModel.setShowReadItems(SharedPreferencesManager.readBoolean(this,
SharedPreferencesManager.SharedPrefKey.SHOW_READ_ARTICLES)); SharedPreferencesManager.SharedPrefKey.SHOW_READ_ARTICLES));

4
app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
View File

@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter; import androidx.fragment.app.FragmentPagerAdapter;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.readrops.app.R; import com.readrops.app.R;
@ -52,7 +52,7 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity {
binding.manageFeedsFoldersViewpager.setAdapter(pageAdapter); binding.manageFeedsFoldersViewpager.setAdapter(pageAdapter);
binding.manageFeedsFoldersTablayout.setupWithViewPager(binding.manageFeedsFoldersViewpager); binding.manageFeedsFoldersTablayout.setupWithViewPager(binding.manageFeedsFoldersViewpager);
viewModel = ViewModelProviders.of(this).get(ManageFeedsFoldersViewModel.class); viewModel = new ViewModelProvider(this).get(ManageFeedsFoldersViewModel.class);
viewModel.setAccount(account); viewModel.setAccount(account);
} }

4
app/src/main/java/com/readrops/app/activities/SplashActivity.java
View File

@ -4,7 +4,7 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.viewmodels.AccountViewModel; import com.readrops.app.viewmodels.AccountViewModel;
@ -22,7 +22,7 @@ public class SplashActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash); setContentView(R.layout.activity_splash);
viewModel = ViewModelProviders.of(this).get(AccountViewModel.class); viewModel = new ViewModelProvider(this).get(AccountViewModel.class);
viewModel.getAccountCount() viewModel.getAccountCount()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())

6
app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java
View File

@ -11,15 +11,15 @@ import android.widget.Spinner;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Feed; import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.readropsdb.pojo.FeedWithFolder;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -59,7 +59,7 @@ public class EditFeedDialogFragment extends DialogFragment implements AdapterVie
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
viewModel = ViewModelProviders.of(getActivity()).get(ManageFeedsFoldersViewModel.class); viewModel = new ViewModelProvider(getActivity()).get(ManageFeedsFoldersViewModel.class);
feedWithFolder = getArguments().getParcelable("feedWithFolder"); feedWithFolder = getArguments().getParcelable("feedWithFolder");
account = getArguments().getParcelable(ACCOUNT); account = getArguments().getParcelable(ACCOUNT);

4
app/src/main/java/com/readrops/app/fragments/FeedsFragment.java
View File

@ -10,7 +10,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@ -64,7 +64,7 @@ public class FeedsFragment extends Fragment {
if (account.getPassword() == null) if (account.getPassword() == null)
account.setPassword(SharedPreferencesManager.readString(getContext(), account.getPasswordKey())); account.setPassword(SharedPreferencesManager.readString(getContext(), account.getPasswordKey()));
viewModel = ViewModelProviders.of(this).get(ManageFeedsFoldersViewModel.class); viewModel = new ViewModelProvider(this).get(ManageFeedsFoldersViewModel.class);
viewModel.setAccount(account); viewModel.setAccount(account);
viewModel.getFeedsWithFolder().observe(this, feedWithFolders -> { viewModel.getFeedsWithFolder().observe(this, feedWithFolders -> {

4
app/src/main/java/com/readrops/app/fragments/FoldersFragment.java
View File

@ -10,7 +10,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@ -65,7 +65,7 @@ public class FoldersFragment extends Fragment {
account.setPassword(SharedPreferencesManager.readString(getContext(), account.getPasswordKey())); account.setPassword(SharedPreferencesManager.readString(getContext(), account.getPasswordKey()));
adapter = new FoldersAdapter(this::openFolderOptionsDialog); adapter = new FoldersAdapter(this::openFolderOptionsDialog);
viewModel = ViewModelProviders.of(this).get(ManageFeedsFoldersViewModel.class); viewModel = new ViewModelProvider(this).get(ManageFeedsFoldersViewModel.class);
viewModel.setAccount(account); viewModel.setAccount(account);
viewModel.getFeedCountByAccount() viewModel.getFeedCountByAccount()

4
app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java
View File

@ -17,7 +17,7 @@ import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
@ -149,7 +149,7 @@ public class AccountSettingsFragment extends PreferenceFragmentCompat {
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
viewModel = ViewModelProviders.of(this).get(AccountViewModel.class); viewModel = new ViewModelProvider(this).get(AccountViewModel.class);
viewModel.setAccount(account); viewModel.setAccount(account);
} }