X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=088fd0bd94527f37107de03c1489e8a31c750e5c;hb=138706a5444b5b9b3b4038b69b27338793dbeb6b;hp=a7787a7e515517800bc20f23759032a134a16b5b;hpb=826bfbfb7fe7a2491954793b0a954f26e28a784d;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java index a7787a7e..088fd0bd 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java @@ -41,7 +41,8 @@ import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; -import java.util.Observable; +import org.jetbrains.annotations.NotNull; + import java.util.Observer; import androidx.annotation.NonNull; @@ -70,20 +71,16 @@ public class TransactionListFragment extends MobileLedgerListFragment { setHasOptionsMenu(true); if (backgroundTaskCountObserver == null) { Log.d("rtl", "creating background task count observer"); - Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() { - @Override - public void update(Observable o, Object arg) { - mActivity.runOnUiThread(() -> { + Data.backgroundTaskCount.addObserver( + backgroundTaskCountObserver = (o, arg) -> mActivity.runOnUiThread(() -> { int cnt = Data.backgroundTaskCount.get(); Log.d("trl", String.format("background task count changed to %d", cnt)); swiper.setRefreshing(cnt > 0); - }); - } - }); + })); } } @Override - public void onAttach(Context context) { + public void onAttach(@NotNull Context context) { super.onAttach(context); mActivity = (MainActivity) context; } @@ -148,7 +145,6 @@ public class TransactionListFragment extends MobileLedgerListFragment { vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter); accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name); - TransactionListFragment me = this; MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true); accNameFilter.setOnItemClickListener((parent, view, position, id) -> { // Log.d("tmp", "direct onItemClick"); @@ -161,15 +157,12 @@ public class TransactionListFragment extends MobileLedgerListFragment { TransactionListViewModel.updating.addObserver( (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get())); - TransactionListViewModel.updateError.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - String err = TransactionListViewModel.updateError.get(); - if (err == null) return; + TransactionListViewModel.updateError.addObserver((o, arg) -> { + String err = TransactionListViewModel.updateError.get(); + if (err == null) return; - Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show(); - TransactionListViewModel.updateError.set(null); - } + Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show(); + TransactionListViewModel.updateError.set(null); }); Data.transactions.addObserver( (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); @@ -195,7 +188,7 @@ public class TransactionListFragment extends MobileLedgerListFragment { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { inflater.inflate(R.menu.transaction_list, menu); menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);