X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionFragment.java;h=9d24f63ed3e960a4d8a66ffaeba8734b9adb699e;hb=3836149c3d9253d6298adddcc6d091f65d98d349;hp=10f246d74af8d285de14f357308378c3cedcb0d4;hpb=bdb39816ef9d0581395547a2f6a7476d825938b3;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java index 10f246d7..9d24f63e 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -93,13 +93,12 @@ public class NewTransactionFragment extends Fragment { "getActivity() returned null within onActivityCreated()"); list = activity.findViewById(R.id.new_transaction_accounts); - viewModel = ViewModelProviders.of(activity) - .get(NewTransactionModel.class); + viewModel = new ViewModelProvider(activity).get(NewTransactionModel.class); mProfile = Data.profile.getValue(); listAdapter = new NewTransactionItemsAdapter(viewModel, mProfile); list.setAdapter(listAdapter); list.setLayoutManager(new LinearLayoutManager(activity)); - Data.profile.observe(this, profile -> { + Data.profile.observe(getViewLifecycleOwner(), profile -> { mProfile = profile; listAdapter.setProfile(profile); }); @@ -143,7 +142,7 @@ public class NewTransactionFragment extends Fragment { }).attachToRecyclerView(list); viewModel.isSubmittable() - .observe(this, isSubmittable -> { + .observe(getViewLifecycleOwner(), isSubmittable -> { if (isSubmittable) { if (fab != null) { fab.show(); @@ -167,7 +166,6 @@ public class NewTransactionFragment extends Fragment { if (args != null) { String error = args.getString("error"); if (error != null) { - // TODO display error Logger.debug("new-trans-f", String.format("Got error: %s", error)); Snackbar.make(list, error, Snackbar.LENGTH_LONG) .show();